diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-12-03 10:14:11 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-12-03 10:14:11 +0000 |
| commit | d2e280c4bf7a7f956cd6a366df668c3921239f8c (patch) | |
| tree | 48eec5cb8a92e86de6522756f2389bf676ce8e04 | |
| parent | b72924676c5daeed22a8d4d7c5308214bf1302ff (diff) | |
| parent | 8f83445a8b412e5b14e074a442c1f8e282647239 (diff) | |
| download | gitlab-ce-d2e280c4bf7a7f956cd6a366df668c3921239f8c.tar.gz | |
Merge branch 'order-of-notification-settings' into 'master'
reorder notification settings by noisy-ness
See merge request gitlab-org/gitlab-ce!23490
| -rw-r--r-- | app/models/notification_setting.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/order-of-notification-settings.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb index 1600acfc575..e82eaf4e069 100644 --- a/app/models/notification_setting.rb +++ b/app/models/notification_setting.rb @@ -5,7 +5,7 @@ class NotificationSetting < ActiveRecord::Base ignore_column :events - enum level: { global: 3, watch: 2, mention: 4, participating: 1, disabled: 0, custom: 5 } + enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 } default_value_for :level, NotificationSetting.levels[:global] diff --git a/changelogs/unreleased/order-of-notification-settings.yml b/changelogs/unreleased/order-of-notification-settings.yml new file mode 100644 index 00000000000..0f0243bcb40 --- /dev/null +++ b/changelogs/unreleased/order-of-notification-settings.yml @@ -0,0 +1,5 @@ +--- +title: reorder notification settings by noisy-ness +merge_request: +author: C.J. Jameson +type: changed |