Commit d2e280c4 authored by Sean McGivern's avatar Sean McGivern

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

reorder notification settings by noisy-ness

See merge request gitlab-org/gitlab-ce!23490
parents b7292467 8f83445a
...@@ -5,7 +5,7 @@ class NotificationSetting < ActiveRecord::Base ...@@ -5,7 +5,7 @@ class NotificationSetting < ActiveRecord::Base
ignore_column :events 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] default_value_for :level, NotificationSetting.levels[:global]
......
---
title: reorder notification settings by noisy-ness
merge_request:
author: C.J. Jameson
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment