summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-19 11:34:48 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-19 11:34:48 +0200
commit7ae139566b46050b31bf01a6302af560fc129819 (patch)
treecc342c422373d89d12aa763a8a924d241192b4a1 /app/models/user.rb
parenta32f7766098bf38b1028168b4919516460a562e9 (diff)
parent8adeda37b55fc992e3cb15422cae5d9646640630 (diff)
downloadgitlab-ce-full-width-tables.tar.gz
Merge branch 'master' into full-width-tablesfull-width-tables
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 3b346c55edb..7e4321d5376 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -183,7 +183,7 @@ class User < ActiveRecord::Base
# User's Project preference
# Note: When adding an option, it MUST go on the end of the array.
- enum project_view: [:readme, :activity]
+ enum project_view: [:readme, :activity, :files]
alias_attribute :private_token, :authentication_token