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
Jérome Perrin
gitlab-ce
Commits
fc9844e8
Commit
fc9844e8
authored
May 16, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update documentation
parent
c2c7014e
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
35 deletions
+37
-35
CHANGELOG
CHANGELOG
+1
-0
app/models/user.rb
app/models/user.rb
+1
-1
doc/workflow/notifications.md
doc/workflow/notifications.md
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+34
-33
No files found.
CHANGELOG
View file @
fc9844e8
...
@@ -36,6 +36,7 @@ v 8.8.0 (unreleased)
...
@@ -36,6 +36,7 @@ v 8.8.0 (unreleased)
- Added button to toggle whitespaces changes on diff view
- Added button to toggle whitespaces changes on diff view
- Backport GitHub Enterprise import support from EE
- Backport GitHub Enterprise import support from EE
- Create tags using Rugged for performance reasons. !3745
- Create tags using Rugged for performance reasons. !3745
- Allow guests to set notification level in projects
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- API: Expose Issue#user_notes_count. !3126 (Anton Popov)
- Don't show forks button when user can't view forks
- Don't show forks button when user can't view forks
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
...
...
app/models/user.rb
View file @
fc9844e8
...
@@ -777,7 +777,7 @@ class User < ActiveRecord::Base
...
@@ -777,7 +777,7 @@ class User < ActiveRecord::Base
end
end
def
notification_settings_for
(
source
)
def
notification_settings_for
(
source
)
notification_setting
=
notification_settings
.
find_or_initialize_by
(
source:
source
)
notification_setting
=
notification_settings
.
find_or_initialize_by
(
source:
source
)
if
source
.
is_a?
(
Project
)
&&
!
source
.
team
.
member?
(
id
)
&&
!
notification_setting
.
persisted?
if
source
.
is_a?
(
Project
)
&&
!
source
.
team
.
member?
(
id
)
&&
!
notification_setting
.
persisted?
notification_setting
.
level
=
:disabled
notification_setting
.
level
=
:disabled
...
...
doc/workflow/notifications.md
View file @
fc9844e8
...
@@ -69,7 +69,7 @@ In all of the below cases, the notification will be sent to:
...
@@ -69,7 +69,7 @@ In all of the below cases, the notification will be sent to:
...with notification level "Participating" or higher
...with notification level "Participating" or higher
-
Watchers:
project memb
ers with notification level "Watch"
-
Watchers:
us
ers with notification level "Watch"
-
Subscribers: anyone who manually subscribed to the issue/merge request
-
Subscribers: anyone who manually subscribed to the issue/merge request
| Event | Sent to |
| Event | Sent to |
...
...
spec/services/notification_service_spec.rb
View file @
fc9844e8
This diff is collapsed.
Click to expand it.
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