diff options
| author | Robb Kidd <robb@thekidds.org> | 2012-10-10 02:25:29 +0400 |
|---|---|---|
| committer | Robb Kidd <robb@thekidds.org> | 2012-10-11 01:59:25 +0400 |
| commit | 16ceae895e32c2474de04c42307d914bf9a4c304 (patch) | |
| tree | aa3a0104064cd80e6716ec010257103b0e66f377 /config | |
| parent | 2b7fd29b1abb3ab6ca5ece7fe2b093f6672796d6 (diff) | |
Separate observing of Note and MergeRequests
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 1189035fa86..74ed330effd 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,7 +23,15 @@ module Gitlab # config.plugins = [ :exception_notification, :ssl_requirement, :all ] # Activate observers that should always be running. - config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer, :system_hook_observer, :users_project_observer + config.active_record.observers = :activity_observer, + :issue_observer, + :key_observer, + :merge_request_observer, + :note_observer, + :project_observer, + :system_hook_observer, + :user_observer, + :users_project_observer # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. |