diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-08-22 11:49:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-08-22 11:49:12 +0000 |
| commit | a19f6fb5003c0fe97e25e4d24418e4f50458bd77 (patch) | |
| tree | 216b93a3e87d842a05d185d82344254d406ad443 /lib/redmine/hook.rb | |
| parent | 1a630c5581982ec13b6044733147ac56f9814a07 (diff) | |
| download | redmine-a19f6fb5003c0fe97e25e4d24418e4f50458bd77.tar.gz redmine-a19f6fb5003c0fe97e25e4d24418e4f50458bd77.zip | |
Reverts r14510 (#20508) and r14511 (#20507), tests broken.
git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/hook.rb')
| -rw-r--r-- | lib/redmine/hook.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb index 419b75e25..7f518d8d4 100644 --- a/lib/redmine/hook.rb +++ b/lib/redmine/hook.rb @@ -125,11 +125,11 @@ module Redmine end end end - + def controller nil end - + def config ActionController::Base.config end @@ -171,5 +171,5 @@ module Redmine end end -ActionView::Base.send(:include, Redmine::Hook::Helper) +ApplicationHelper.send(:include, Redmine::Hook::Helper) ActionController::Base.send(:include, Redmine::Hook::Helper) |