Merged r17170 from trunk to 3.4-stable (#27963).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17171 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/extra/sample_plugin/app/controllers/example_controller.rb b/extra/sample_plugin/app/controllers/example_controller.rb
index b85599a37b7293099fe61d8993c151d009074b73..d38d01d917ccf395d930fa149a763702b0b2d8fc 100644 (file)
--- a/extra/sample_plugin/app/controllers/example_controller.rb
+++ b/extra/sample_plugin/app/controllers/example_controller.rb
@@ -1,7 +1,5 @@
 # Sample plugin controller
 class ExampleController < ApplicationController
-  unloadable
-
   layout 'base'
   before_action :find_project, :authorize
   menu_item :sample_plugin