diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:52:07 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:52:07 +0000 |
| commit | 9295fb20b77e303a0a0c00df77cca917000de18c (patch) | |
| tree | 617aa2c05dac9b88154cf6790732ac31696ce045 /app/services | |
| parent | 3deb879ff25c2c85bae29e8e820e8cd135662b2b (diff) | |
| parent | bf0fd497bf3370edd7bbaf8c3421ff333719d004 (diff) | |
| download | gitlab-ce-9295fb20b77e303a0a0c00df77cca917000de18c.tar.gz | |
Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'
Fix notification when group set to watch
Closes #395
See merge request !8883
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notification_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index f74e6cac174..b2cc39763f3 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -365,7 +365,7 @@ class NotificationService users = users_with_global_level_watch([users_with_project_level_global, users_with_group_level_global].flatten.uniq) users_with_project_setting = select_project_member_setting(project, users_with_project_level_global, users) - users_with_group_setting = select_group_member_setting(project, project_members, users_with_group_level_global, users) + users_with_group_setting = select_group_member_setting(project.group, project_members, users_with_group_level_global, users) User.where(id: users_with_project_setting.concat(users_with_group_setting).uniq).to_a end @@ -415,8 +415,8 @@ class NotificationService end # Build a list of users based on group notification settings - def select_group_member_setting(project, project_members, global_setting, users_global_level_watch) - uids = notification_settings_for(project, :watch) + def select_group_member_setting(group, project_members, global_setting, users_global_level_watch) + uids = notification_settings_for(group, :watch) # Group setting is watch, add to users list if user is not project member users = [] @@ -473,7 +473,7 @@ class NotificationService setting = user.notification_settings_for(project) - if !setting && project.group + if project.group && (setting.nil? || setting.global?) setting = user.notification_settings_for(project.group) end |