diff options
| author | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
|---|---|---|
| committer | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
| commit | 58f29d5f855ea2e1411b99804a74710483a13f90 (patch) | |
| tree | 0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /app/models/user.rb | |
| parent | 0572da24c990fc01d88acfbd32728221e3e3a711 (diff) | |
| parent | a9827357186e38e5732d8dae23d9d02b1f4c7218 (diff) | |
| download | gitlab-ce-48746-fix-files-uploaded-in-base64.tar.gz | |
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8a7acfb73b1..a0665518cf5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -217,7 +217,7 @@ class User < ActiveRecord::Base # User's Dashboard preference # Note: When adding an option, it MUST go on the end of the array. - enum dashboard: [:projects, :stars, :project_activity, :starred_project_activity, :groups, :todos, :issues, :merge_requests] + enum dashboard: [:projects, :stars, :project_activity, :starred_project_activity, :groups, :todos, :issues, :merge_requests, :operations] # User's Project preference # Note: When adding an option, it MUST go on the end of the array. |