summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-06-17 12:26:32 -0300
committerFelipe Artur <felipefac@gmail.com>2016-06-17 12:33:11 -0300
commitab236c76247d83c190b148acbffa48f244414553 (patch)
tree69b17bdec6f52d96d1e4d7a807f3432263ef3cd4 /lib
parenta4b078bfb8b99a9852eb55abd498d65a374375e3 (diff)
downloadgitlab-ce-ab236c76247d83c190b148acbffa48f244414553.tar.gz
Allow users to set custom notifications in projects they don't own and several fixes to code
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 7818fc290f8..cc29c7ef428 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -272,8 +272,7 @@ module API
expose :access_level
expose :notification_level do |member, options|
if member.notification_setting
- setting = member.notification_setting
- { level: NotificationSetting.levels[setting.level], events: setting.events }
+ NotificationSetting.levels[member.notification_setting.level]
end
end
end