diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 10:01:42 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 10:01:42 +0300 |
| commit | 6d92aa6d12b875b4987666da98658191ae426892 (patch) | |
| tree | d4f509f30debf7318dcfb3db92891d7a99a0b125 | |
| parent | 55f83385023adf0fc70a54922209388a223dd05f (diff) | |
| download | gitlab-ce-6d92aa6d12b875b4987666da98658191ae426892.tar.gz | |
Fix IssueObserver current_user assign. Refactored observers
| -rw-r--r-- | app/controllers/application_controller.rb | 10 | ||||
| -rw-r--r-- | app/observers/activity_observer.rb (renamed from app/models/activity_observer.rb) | 0 | ||||
| -rw-r--r-- | app/observers/issue_observer.rb (renamed from app/models/issue_observer.rb) | 0 | ||||
| -rw-r--r-- | app/observers/key_observer.rb (renamed from app/models/key_observer.rb) | 0 | ||||
| -rw-r--r-- | app/observers/mailer_observer.rb (renamed from app/models/mailer_observer.rb) | 0 | ||||
| -rw-r--r-- | app/observers/project_observer.rb (renamed from app/models/project_observer.rb) | 0 | ||||
| -rw-r--r-- | app/observers/user_observer.rb (renamed from app/models/user_observer.rb) | 0 |
7 files changed, 9 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c31788ed09..9a0f95bf0cb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,8 +1,12 @@ class ApplicationController < ActionController::Base before_filter :authenticate_user! before_filter :reject_blocked! - before_filter :set_current_user_for_mailer, :check_token_auth + before_filter :set_current_user_for_mailer + before_filter :check_token_auth + before_filter :set_current_user_for_observers + protect_from_forgery + helper_method :abilities, :can? rescue_from Gitlab::Gitolite::AccessDenied do |exception| @@ -58,6 +62,10 @@ class ApplicationController < ActionController::Base MailerObserver.current_user = current_user end + def set_current_user_for_observers + IssueObserver.current_user = current_user + end + def abilities @abilities ||= Six.new end diff --git a/app/models/activity_observer.rb b/app/observers/activity_observer.rb index 324d8207d22..324d8207d22 100644 --- a/app/models/activity_observer.rb +++ b/app/observers/activity_observer.rb diff --git a/app/models/issue_observer.rb b/app/observers/issue_observer.rb index fadedd301f4..fadedd301f4 100644 --- a/app/models/issue_observer.rb +++ b/app/observers/issue_observer.rb diff --git a/app/models/key_observer.rb b/app/observers/key_observer.rb index fac53a67925..fac53a67925 100644 --- a/app/models/key_observer.rb +++ b/app/observers/key_observer.rb diff --git a/app/models/mailer_observer.rb b/app/observers/mailer_observer.rb index 880fd5026a4..880fd5026a4 100644 --- a/app/models/mailer_observer.rb +++ b/app/observers/mailer_observer.rb diff --git a/app/models/project_observer.rb b/app/observers/project_observer.rb index 135959ab738..135959ab738 100644 --- a/app/models/project_observer.rb +++ b/app/observers/project_observer.rb diff --git a/app/models/user_observer.rb b/app/observers/user_observer.rb index d12bcc99c83..d12bcc99c83 100644 --- a/app/models/user_observer.rb +++ b/app/observers/user_observer.rb |