From: Go MAEDA <maeda@farend.jp>
Date: Wed, 10 Jan 2018 08:40:14 +0000 (+0000)
Subject: Merged r17170 from trunk to 3.4-stable (#27963).
X-Git-Tag: 3.4.5~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=43ea0154976ef2704bcbfd7e8d4651c78d3fd08c;p=redmine.git

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 b85599a37..d38d01d91 100644
--- 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