diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-04 09:30:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-04 09:30:16 +0000 |
| commit | 14b68586b8c2187d918a2d6c8cad51a72e2b51cd (patch) | |
| tree | ba2beccc6e55cf0dc29e4e7a32532b47b3bb188a | |
| parent | a3af64b418b934bbdbfa3e7caeceb1215be4a0cf (diff) | |
| parent | eca269f7f98b3a2455e7788c884bcb927ea693b1 (diff) | |
| download | gitlab-ce-14b68586b8c2187d918a2d6c8cad51a72e2b51cd.tar.gz | |
Merge branch 'no_email_on_notification_level_change' into 'master'
Don't send emails on notification level change
| -rw-r--r-- | app/observers/users_project_observer.rb | 2 | ||||
| -rw-r--r-- | spec/observers/users_project_observer_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/observers/users_project_observer.rb b/app/observers/users_project_observer.rb index 93233898cc8..44c72b30187 100644 --- a/app/observers/users_project_observer.rb +++ b/app/observers/users_project_observer.rb @@ -10,7 +10,7 @@ class UsersProjectObserver < BaseObserver end def after_update(users_project) - notification.update_team_member(users_project) + notification.update_team_member(users_project) if users_project.project_access_changed? end def after_destroy(users_project) diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb index be277b4dbd2..b024465e8c3 100644 --- a/spec/observers/users_project_observer_spec.rb +++ b/spec/observers/users_project_observer_spec.rb @@ -21,7 +21,7 @@ describe UsersProjectObserver do it "should send email to user" do subject.should_receive(:notification) - @users_project.update_attribute(:project_access, UsersProject::MASTER) + @users_project.update_attribute(:project_access, UsersProject::OWNER) end it "should not called after UsersProject destroyed" do |