Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
9cd46811
Commit
9cd46811
authored
Jul 20, 2017
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
protect against nil project/group/setting
parent
b188e1b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/services/notification_recipient_service.rb
app/services/notification_recipient_service.rb
+4
-4
No files found.
app/services/notification_recipient_service.rb
View file @
9cd46811
...
@@ -5,13 +5,13 @@ class NotificationRecipientService
...
@@ -5,13 +5,13 @@ class NotificationRecipientService
attr_reader
:project
attr_reader
:project
def
self
.
notification_setting_for_user_project
(
user
,
project
)
def
self
.
notification_setting_for_user_project
(
user
,
project
)
project_setting
=
user
.
notification_settings_for
(
project
)
project_setting
=
project
&&
user
.
notification_settings_for
(
project
)
return
project_setting
unless
project_setting
.
global?
return
project_setting
unless
project_setting
.
nil?
||
project_setting
.
global?
group_setting
=
user
.
notification_settings_for
(
project
.
group
)
group_setting
=
project
&
.
group
&&
user
.
notification_settings_for
(
project
.
group
)
return
group_setting
unless
group_setting
.
global?
return
group_setting
unless
group_setting
.
nil?
||
group_setting
.
global?
user
.
global_notification_setting
user
.
global_notification_setting
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment