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
iv
gitlab-ce
Commits
07ff874f
Commit
07ff874f
authored
Apr 29, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Let users set notification levels in projects which they are not members
parent
98d88e81
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
6 deletions
+65
-6
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-3
app/models/user.rb
app/models/user.rb
+8
-1
spec/controllers/projects/notification_settings_controller_spec.rb
...rollers/projects/notification_settings_controller_spec.rb
+14
-0
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+34
-1
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+1
-0
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+7
-1
No files found.
app/controllers/projects_controller.rb
View file @
07ff874f
...
...
@@ -102,9 +102,7 @@ class ProjectsController < Projects::ApplicationController
respond_to
do
|
format
|
format
.
html
do
if
current_user
@membership
=
@project
.
team
.
find_member
(
current_user
.
id
)
if
@membership
if
can?
(
current_user
,
:read_project
,
@project
)
@notification_setting
=
current_user
.
notification_settings_for
(
@project
)
end
end
...
...
app/models/user.rb
View file @
07ff874f
...
...
@@ -777,7 +777,14 @@ class User < ActiveRecord::Base
end
def
notification_settings_for
(
source
)
notification_settings
.
find_or_initialize_by
(
source:
source
)
notification_setting
=
notification_settings
.
find_or_initialize_by
({
source:
source
})
if
source
.
is_a?
(
Project
)
membership
=
source
.
team
.
find_member
(
self
.
id
)
notification_setting
.
level
=
:disabled
unless
membership
.
present?
||
notification_setting
.
persisted?
end
notification_setting
end
private
...
...
spec/controllers/projects/notification_settings_controller_spec.rb
View file @
07ff874f
...
...
@@ -34,5 +34,19 @@ describe Projects::NotificationSettingsController do
expect
(
response
.
status
).
to
eq
200
end
end
context
'not authorized'
do
let
(
:private_project
)
{
create
(
:project
,
:private
)
}
before
{
sign_in
(
user
)
}
it
'returns 404'
do
put
:update
,
namespace_id:
private_project
.
namespace
.
to_param
,
project_id:
private_project
.
to_param
,
notification_setting:
{
level: :participating
}
expect
(
response
.
status
).
to
eq
(
404
)
end
end
end
end
spec/controllers/projects_controller_spec.rb
View file @
07ff874f
...
...
@@ -8,10 +8,43 @@ describe ProjectsController do
let
(
:txt
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/doc_sample.txt'
,
'text/plain'
)
}
describe
"GET show"
do
context
"user not project member"
do
before
{
sign_in
(
user
)
}
context
"user does not have access to project"
do
let
(
:private_project
)
{
create
(
:project
,
:private
)
}
it
"does not initialize notification setting"
do
get
:show
,
namespace_id:
private_project
.
namespace
.
path
,
id:
private_project
.
path
expect
(
assigns
(
:notification_setting
)).
to
be_nil
end
end
context
"user has access to project"
do
context
"and does not have notification setting"
do
it
"initializes notification as disabled"
do
get
:show
,
namespace_id:
public_project
.
namespace
.
path
,
id:
public_project
.
path
expect
(
assigns
(
:notification_setting
).
level
).
to
eq
(
"disabled"
)
end
end
context
"and has notification setting"
do
before
do
setting
=
user
.
notification_settings_for
(
public_project
)
setting
.
level
=
:global
setting
.
save
end
it
"shows current notification setting"
do
get
:show
,
namespace_id:
public_project
.
namespace
.
path
,
id:
public_project
.
path
expect
(
assigns
(
:notification_setting
).
level
).
to
eq
(
"global"
)
end
end
end
end
context
"rendering default project view"
do
render_views
it
"renders the activity view"
do
allow
(
controller
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
user
).
to
receive
(
:project_view
).
and_return
(
'activity'
)
...
...
spec/services/merge_requests/update_service_spec.rb
View file @
07ff874f
...
...
@@ -17,6 +17,7 @@ describe MergeRequests::UpdateService, services: true do
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user2
,
:developer
]
project
.
team
<<
[
user3
,
:developer
]
end
describe
'execute'
do
...
...
spec/services/notification_service_spec.rb
View file @
07ff874f
...
...
@@ -119,7 +119,10 @@ describe NotificationService, services: true do
let
(
:note
)
{
create
(
:note_on_issue
,
noteable:
confidential_issue
,
project:
project
,
note:
"
#{
author
.
to_reference
}
#{
assignee
.
to_reference
}
#{
non_member
.
to_reference
}
#{
member
.
to_reference
}
#{
admin
.
to_reference
}
"
)
}
it
'filters out users that can not read the issue'
do
project
.
team
<<
[
admin
,
:master
]
project
.
team
<<
[
author
,
:developer
]
project
.
team
<<
[
member
,
:developer
]
project
.
team
<<
[
assignee
,
:developer
]
expect
(
SentNotification
).
to
receive
(
:record
).
with
(
confidential_issue
,
any_args
).
exactly
(
4
).
times
...
...
@@ -143,7 +146,8 @@ describe NotificationService, services: true do
before
do
build_team
(
note
.
project
)
note
.
project
.
team
<<
[
note
.
author
,
:master
]
note
.
project
.
team
<<
[[
note
.
author
,
note
.
noteable
.
author
,
note
.
noteable
.
assignee
],
:master
]
ActionMailer
::
Base
.
deliveries
.
clear
end
...
...
@@ -260,6 +264,7 @@ describe NotificationService, services: true do
before
do
build_team
(
issue
.
project
)
add_users_with_subscription
(
issue
.
project
,
issue
)
project
.
team
<<
[[
issue
.
assignee
,
issue
.
author
],
:developer
]
ActionMailer
::
Base
.
deliveries
.
clear
end
...
...
@@ -491,6 +496,7 @@ describe NotificationService, services: true do
before
do
build_team
(
merge_request
.
target_project
)
add_users_with_subscription
(
merge_request
.
target_project
,
merge_request
)
project
.
team
<<
[
merge_request
.
assignee
,
:developer
]
ActionMailer
::
Base
.
deliveries
.
clear
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