deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1675 from robbkidd/separate_mr_observer

Browse source 
Separate observing of Note and MergeRequests
This commit is contained in:
Dmitriy Zaporozhets 2012-10-11 09:35:21 -07:00
commit baf94bd732
11 changed files with 445 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -1,7 +1,6 @@
class ApplicationController < ActionController::Base
before_filter :authenticate_user!
before_filter :reject_blocked!
before_filter :set_current_user_for_mailer
before_filter :set_current_user_for_observers
before_filter :dev_tools if Rails.env == 'development'
@ -41,11 +40,8 @@ class ApplicationController < ActionController::Base
end
end
def set_current_user_for_mailer
MailerObserver.current_user = current_user
end
def set_current_user_for_observers
MergeRequestObserver.current_user = current_user
IssueObserver.current_user = current_user
end