Merge branch 'order-of-notification-settings' into 'master'

reorder notification settings by noisy-ness

See merge request gitlab-org/gitlab-ce!23490

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]
 

changelogs/unreleased/order-of-notification-settings.yml

+---
+title: reorder notification settings by noisy-ness
+merge_request:
+author: C.J. Jameson
+type: changed