Merge pull request #21 from syoshim/redmine-v4.0

Follow up the Redmine version up (3.4 to 4.0)
ncoders · Aug 28, 2019 · a2e12fd · a2e12fd
2 parents 08953c8 + 348483a
commit a2e12fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/init.rb b/init.rb
@@ -25,7 +25,8 @@
   version '1.0.3'
 end
 
-ActionDispatch::Callbacks.to_prepare do
+receiver = Object.const_defined?('ActiveSupport::Reloader') ?  ActiveSupport::Reloader : ActionDispatch::Callbacks
+receiver.to_prepare  do
 	require_dependency 'project'
 	require_dependency 'principal'
 	require_dependency 'user'

diff --git a/lib/application_helper_avatar_patch.rb b/lib/application_helper_avatar_patch.rb
@@ -22,7 +22,8 @@ module LocalAvatarsPlugin
   module ApplicationAvatarPatch
     def self.included(base) # :nodoc:    
       base.class_eval do
-  			alias_method_chain :avatar, :local
+        alias_method :avatar_without_local, :avatar
+        alias_method :avatar, :avatar_with_local
       end
     end
 

diff --git a/lib/users_helper_avatar_patch.rb b/lib/users_helper_avatar_patch.rb
@@ -22,7 +22,8 @@ module LocalAvatarsPlugin
   module UsersHelperPatch
     def self.included(base) # :nodoc:    
       base.class_eval do      
-        alias_method_chain :user_settings_tabs, :avatar
+        alias_method :user_settings_tabs_without_avatar, :user_settings_tabs
+        alias_method :user_settings_tabs, :user_settings_tabs_with_avatar
       end
     end