Merge branch 'feature/redmine4' of github.com:mamewotoko/redmine_tagg…

…ing into feature/redmine4

Gemfile

@@ -1,2 +1 @@
-#gem 'acts-as-taggable-on', '~> 4.0'
-gem 'acts-as-taggable-on', '5.0.0'
+gem 'acts-as-taggable-on', '~> 6.0'

init.rb

@@ -92,14 +92,31 @@
   end
 end
 
+
 # redmine4
-ActiveSupport::Reloader.to_prepare do
-#ActionDispatch::Callbacks.to_prepare do
-  require 'tagging_plugin/tagging_patches'
-  require 'tagging_plugin/api_template_handler_patch'
-  require 'redmine_tagging'
-  require File.expand_path('../app/helpers/tagging_helper', __FILE__)
-  ActionView::Base.send :include, TaggingHelper
-end
+# ActiveSupport::Reloader.to_prepare do
+# #ActionDispatch::Callbacks.to_prepare do
+#   require 'tagging_plugin/tagging_patches'
+#   require 'tagging_plugin/api_template_handler_patch'
+#   require 'redmine_tagging'
+#   require File.expand_path('../app/helpers/tagging_helper', __FILE__)
+#   ActionView::Base.send :include, TaggingHelper
 
+if Rails::VERSION::MAJOR == 5
+  ActiveSupport::Reloader.to_prepare do
+    require 'tagging_plugin/tagging_patches'
+    require 'tagging_plugin/api_template_handler_patch'
+    require 'redmine_tagging'
+    require File.expand_path('../app/helpers/tagging_helper', __FILE__)
+    ActionView::Base.send :include, TaggingHelper
+  end
+else
+  ActionDispatch::Callbacks.to_prepare do
+    require 'tagging_plugin/tagging_patches'
+    require 'tagging_plugin/api_template_handler_patch'
+    require 'redmine_tagging'
+    require File.expand_path('../app/helpers/tagging_helper', __FILE__)
+    ActionView::Base.send :include, TaggingHelper
+  end
+end
 require_dependency 'tagging_plugin/tagging_hooks'

lib/redmine_tagging/patches/issue_patch.rb

@@ -15,10 +15,10 @@ module RedmineTagging::Patches::IssuePatch
 
     has_many :issue_tags
 
-    #alias_method_chain :create_journal, :tags
+    # alias_method_chain :create_journal, :tags
     alias_method :create_journal_without_tags, :create_journal
     alias_method :create_journal, :create_journal_with_tags
-    
+
     # alias_method_chain :init_journal, :tags
     alias_method :init_journal_without_tags, :init_journal
     alias_method :init_journal, :init_journal_with_tags

lib/tagging_plugin/tagging_patches.rb

@@ -27,7 +27,7 @@ def self.included(base) # :nodoc:
       base.class_eval do
         unloadable
 
-        #alias_method_chain :update, :tags
+        # alias_method_chain :update, :tags
         alias_method :update_without_tags, :update
         alias_method :update, :update_with_tags
       end