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
8f6d43e0
Commit
8f6d43e0
authored
Jun 06, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove notification level from user model
parent
f29fd65c
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
391 additions
and
61 deletions
+391
-61
CHANGELOG
CHANGELOG
+1
-0
app/controllers/profiles/notifications_controller.rb
app/controllers/profiles/notifications_controller.rb
+20
-4
app/helpers/notifications_helper.rb
app/helpers/notifications_helper.rb
+32
-0
app/models/notification_setting.rb
app/models/notification_setting.rb
+0
-1
app/models/user.rb
app/models/user.rb
+10
-8
app/services/notification_service.rb
app/services/notification_service.rb
+8
-8
app/views/profiles/notifications/_group_settings.html.haml
app/views/profiles/notifications/_group_settings.html.haml
+1
-1
app/views/profiles/notifications/_project_settings.html.haml
app/views/profiles/notifications/_project_settings.html.haml
+1
-1
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-27
db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
...92159_remove_notification_setting_not_null_constraints.rb
+7
-0
db/migrate/20160607201627_migrate_users_notification_level.rb
...igrate/20160607201627_migrate_users_notification_level.rb
+24
-0
spec/models/notification_setting_spec.rb
spec/models/notification_setting_spec.rb
+0
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+286
-10
No files found.
CHANGELOG
View file @
8f6d43e0
...
...
@@ -54,6 +54,7 @@ v 8.9.0 (unreleased)
- Improve error handling importing projects
- Remove duplicated notification settings
- Put project Files and Commits tabs under Code tab
- Decouple global notification level from user model
- Replace Colorize with Rainbow for coloring console output in Rake tasks.
- An indicator is now displayed at the top of the comment field for confidential issues.
- RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
...
...
app/controllers/profiles/notifications_controller.rb
View file @
8f6d43e0
class
Profiles::NotificationsController
<
Profiles
::
ApplicationController
def
show
@user
=
current_user
@group_notifications
=
current_user
.
notification_settings
.
for_groups
@project_notifications
=
current_user
.
notification_settings
.
for_projects
@user
=
current_user
@group_notifications
=
current_user
.
notification_settings
.
for_groups
@project_notifications
=
current_user
.
notification_settings
.
for_projects
@global_notification_setting
=
current_user
.
global_notification_setting
end
def
update
if
current_user
.
update_attributes
(
user_params
)
if
current_user
.
update_attributes
(
user_params
)
&&
update_notification_settings
flash
[
:notice
]
=
"Notification settings saved"
else
flash
[
:alert
]
=
"Failed to save new settings"
...
...
@@ -18,4 +19,19 @@ class Profiles::NotificationsController < Profiles::ApplicationController
def
user_params
params
.
require
(
:user
).
permit
(
:notification_email
,
:notification_level
)
end
def
notification_params
params
.
require
(
:notification_level
)
end
private
def
update_notification_settings
return
true
unless
notification_params
notification_setting
=
current_user
.
global_notification_setting
notification_setting
.
level
=
notification_params
notification_setting
.
save
end
end
app/helpers/notifications_helper.rb
View file @
8f6d43e0
...
...
@@ -61,4 +61,36 @@ module NotificationsHelper
end
end
end
def
notification_level_radio_buttons
html
=
""
NotificationSetting
.
levels
.
each_key
do
|
level
|
level
=
level
.
to_sym
next
if
level
==
:global
html
<<
content_tag
(
:div
,
class:
"radio"
)
do
content_tag
(
:label
,
{
value:
level
})
do
radio_button_tag
(
:notification_level
,
level
,
@global_notification_setting
.
level
.
to_sym
==
level
)
+
content_tag
(
:div
,
level
.
to_s
.
capitalize
,
class:
"level-title"
)
+
content_tag
(
:p
,
notification_level_description
(
level
))
end
end
end
html
.
html_safe
end
def
notification_level_description
(
level
)
case
level
when
:disabled
"You will not get any notifications via email"
when
:mention
"You will receive notifications only for comments in which you were @mentioned"
when
:participating
"You will only receive notifications from related resources (e.g. from your commits or assigned issues)"
when
:watch
"You will receive notifications for any activity"
end
end
end
app/models/notification_setting.rb
View file @
8f6d43e0
...
...
@@ -7,7 +7,6 @@ class NotificationSetting < ActiveRecord::Base
belongs_to
:source
,
polymorphic:
true
validates
:user
,
presence:
true
validates
:source
,
presence:
true
validates
:level
,
presence:
true
validates
:user_id
,
uniqueness:
{
scope:
[
:source_type
,
:source_id
],
message:
"already exists in source"
,
...
...
app/models/user.rb
View file @
8f6d43e0
...
...
@@ -10,6 +10,8 @@ class User < ActiveRecord::Base
include
CaseSensitivity
include
TokenAuthenticatable
DEFAULT_NOTIFICATION_LEVEL
=
:participating
add_authentication_token_field
:authentication_token
default_value_for
:admin
,
false
...
...
@@ -99,7 +101,6 @@ class User < ActiveRecord::Base
presence:
true
,
uniqueness:
{
case_sensitive:
false
}
validates
:notification_level
,
presence:
true
validate
:namespace_uniq
,
if:
->
(
user
)
{
user
.
username_changed?
}
validate
:avatar_type
,
if:
->
(
user
)
{
user
.
avatar
.
present?
&&
user
.
avatar_changed?
}
validate
:unique_email
,
if:
->
(
user
)
{
user
.
email_changed?
}
...
...
@@ -133,13 +134,6 @@ class User < ActiveRecord::Base
# Note: When adding an option, it MUST go on the end of the array.
enum
project_view:
[
:readme
,
:activity
,
:files
]
# Notification level
# Note: When adding an option, it MUST go on the end of the array.
#
# TODO: Add '_prefix: :notification' to enum when update to Rails 5. https://github.com/rails/rails/pull/19813
# Because user.notification_disabled? is much better than user.disabled?
enum
notification_level:
[
:disabled
,
:participating
,
:watch
,
:global
,
:mention
]
alias_attribute
:private_token
,
:authentication_token
delegate
:path
,
to: :namespace
,
allow_nil:
true
,
prefix:
true
...
...
@@ -800,6 +794,14 @@ class User < ActiveRecord::Base
notification_settings
.
find_or_initialize_by
(
source:
source
)
end
# Lazy load global notification setting
# Initializes User setting with Participating level if setting not persisted
def
global_notification_setting
setting
=
notification_settings
.
find_or_initialize_by
(
source:
nil
)
setting
.
level
=
NotificationSetting
.
levels
[
DEFAULT_NOTIFICATION_LEVEL
]
unless
setting
.
persisted?
setting
end
def
assigned_open_merge_request_count
(
force:
false
)
Rails
.
cache
.
fetch
([
'users'
,
id
,
'assigned_open_merge_request_count'
],
force:
force
)
do
assigned_merge_requests
.
opened
.
count
...
...
app/services/notification_service.rb
View file @
8f6d43e0
...
...
@@ -279,10 +279,11 @@ class NotificationService
end
def
users_with_global_level_watch
(
ids
)
User
.
where
(
id:
ids
,
notification_level:
NotificationSetting
.
levels
[
:watch
]
).
pluck
(
:id
)
NotificationSetting
.
where
(
user_id:
ids
,
source_type:
nil
,
level:
NotificationSetting
.
levels
[
:watch
]
).
pluck
(
:user_id
)
end
# Build a list of users based on project notifcation settings
...
...
@@ -352,7 +353,7 @@ class NotificationService
users
=
users
.
reject
(
&
:blocked?
)
users
.
reject
do
|
user
|
next
user
.
notification_
level
==
level
unless
project
next
user
.
global_notification_setting
.
level
==
level
unless
project
setting
=
user
.
notification_settings_for
(
project
)
...
...
@@ -361,13 +362,13 @@ class NotificationService
end
# reject users who globally set mention notification and has no setting per project/group
next
user
.
notification_
level
==
level
unless
setting
next
user
.
global_notification_setting
.
level
==
level
unless
setting
# reject users who set mention notification in project
next
true
if
setting
.
level
==
level
# reject users who have mention level in project and disabled in global settings
setting
.
global?
&&
user
.
notification_
level
==
level
setting
.
global?
&&
user
.
global_notification_setting
.
level
==
level
end
end
...
...
@@ -456,7 +457,6 @@ class NotificationService
def
build_recipients
(
target
,
project
,
current_user
,
action:
nil
,
previous_assignee:
nil
)
recipients
=
target
.
participants
(
current_user
)
recipients
=
add_project_watchers
(
recipients
,
project
)
recipients
=
reject_mention_users
(
recipients
,
project
)
...
...
app/views/profiles/notifications/_group_settings.html.haml
View file @
8f6d43e0
%li
.notification-list-item
%span
.notification.fa.fa-holder.append-right-5
-
if
setting
.
global?
=
notification_icon
(
current_user
.
notification_
level
)
=
notification_icon
(
current_user
.
global_notification_setting
.
level
)
-
else
=
notification_icon
(
setting
.
level
)
...
...
app/views/profiles/notifications/_project_settings.html.haml
View file @
8f6d43e0
%li
.notification-list-item
%span
.notification.fa.fa-holder.append-right-5
-
if
setting
.
global?
=
notification_icon
(
current_user
.
notification_
level
)
=
notification_icon
(
current_user
.
global_notification_setting
.
level
)
-
else
=
notification_icon
(
setting
.
level
)
...
...
app/views/profiles/notifications/show.html.haml
View file @
8f6d43e0
...
...
@@ -26,33 +26,7 @@
=
f
.
select
:notification_email
,
@user
.
all_emails
,
{
include_blank:
false
},
class:
"select2"
.form-group
=
f
.
label
:notification_level
,
class:
'label-light'
.radio
=
f
.
label
:notification_level
,
value: :disabled
do
=
f
.
radio_button
:notification_level
,
:disabled
.level-title
Disabled
%p
You will not get any notifications via email
.radio
=
f
.
label
:notification_level
,
value: :mention
do
=
f
.
radio_button
:notification_level
,
:mention
.level-title
On Mention
%p
You will receive notifications only for comments in which you were @mentioned
.radio
=
f
.
label
:notification_level
,
value: :participating
do
=
f
.
radio_button
:notification_level
,
:participating
.level-title
Participating
%p
You will only receive notifications from related resources (e.g. from your commits or assigned issues)
.radio
=
f
.
label
:notification_level
,
value: :watch
do
=
f
.
radio_button
:notification_level
,
:watch
.level-title
Watch
%p
You will receive notifications for any activity
=
notification_level_radio_buttons
.prepend-top-default
=
f
.
submit
'Update settings'
,
class:
"btn btn-create"
...
...
db/migrate/20160606192159_remove_notification_setting_not_null_constraints.rb
0 → 100644
View file @
8f6d43e0
class
RemoveNotificationSettingNotNullConstraints
<
ActiveRecord
::
Migration
def
up
change_column
:notification_settings
,
:source_type
,
:string
,
null:
true
change_column
:notification_settings
,
:source_id
,
:integer
,
null:
true
change_column
:users
,
:notification_level
,
:integer
,
null:
true
end
end
db/migrate/20160607201627_migrate_users_notification_level.rb
0 → 100644
View file @
8f6d43e0
class
MigrateUsersNotificationLevel
<
ActiveRecord
::
Migration
# Migrates only users which changes theier default notification level :participating
# creating a new record on notification settins table
def
up
changed_users
=
exec_query
(
%Q{
SELECT id, notification_level
FROM users
WHERE notification_level != 1
}
)
changed_users
.
each
do
|
row
|
uid
=
row
[
'id'
]
u_notification_level
=
row
[
'notification_level'
]
execute
(
%Q{
INSERT INTO notification_settings
(user_id, level, created_at, updated_at)
VALUES
(
#{
uid
}
,
#{
u_notification_level
}
, now(), now())
}
)
end
end
end
spec/models/notification_setting_spec.rb
View file @
8f6d43e0
...
...
@@ -10,7 +10,6 @@ RSpec.describe NotificationSetting, type: :model do
subject
{
NotificationSetting
.
new
(
source_id:
1
,
source_type:
'Project'
)
}
it
{
is_expected
.
to
validate_presence_of
(
:user
)
}
it
{
is_expected
.
to
validate_presence_of
(
:source
)
}
it
{
is_expected
.
to
validate_presence_of
(
:level
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:user_id
).
scoped_to
([
:source_id
,
:source_type
]).
with_message
(
/already exists in source/
)
}
end
...
...
spec/services/notification_service_spec.rb
View file @
8f6d43e0
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