From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 8 Jan 2018 17:54:28 +0000 (+0000)
Subject: Merged r17160 to 3.4-stable (#20513).
X-Git-Tag: 3.4.4~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab31c2e23f2e6e01b0aa3f651591c18416afcd96;p=redmine.git

Merged r17160 to 3.4-stable (#20513).

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

diff --git a/lib/generators/redmine_plugin_controller/templates/controller.rb.erb b/lib/generators/redmine_plugin_controller/templates/controller.rb.erb
index dddbf7017..0fc5e5c8f 100644
--- a/lib/generators/redmine_plugin_controller/templates/controller.rb.erb
+++ b/lib/generators/redmine_plugin_controller/templates/controller.rb.erb
@@ -1,6 +1,4 @@
 class <%= @controller_class %>Controller < ApplicationController
-  unloadable
-
 <% actions.each do |action| -%>
 
   def <%= action %>
diff --git a/lib/generators/redmine_plugin_model/templates/model.rb.erb b/lib/generators/redmine_plugin_model/templates/model.rb.erb
index 71284e96d..cb6f31411 100644
--- a/lib/generators/redmine_plugin_model/templates/model.rb.erb
+++ b/lib/generators/redmine_plugin_model/templates/model.rb.erb
@@ -1,3 +1,2 @@
 class <%= @model_class %> < ActiveRecord::Base
-  unloadable
 end