summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC.J. Jameson <cjameson@tableau.com>2018-11-30 18:16:03 -0800
committerC.J. Jameson <cjameson@tableau.com>2018-11-30 18:16:03 -0800
commit8f83445a8b412e5b14e074a442c1f8e282647239 (patch)
tree3256d933c73f885c12191c5fb3580c8fdf66a900
parent953018e3d4b0bc101543218f4cdf235e1a9d51c8 (diff)
downloadgitlab-ce-8f83445a8b412e5b14e074a442c1f8e282647239.tar.gz
reorder notification settings by noisy-ness
fixes !54609
-rw-r--r--app/models/notification_setting.rb2
-rw-r--r--changelogs/unreleased/order-of-notification-settings.yml5
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