diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
| commit | eab086bde11f30551b4a8b27b0a344e654924a1c (patch) | |
| tree | 89e290bacbad9765560c7673344919a6b44ca02c /app/models/user.rb | |
| parent | 1464a69c76cf492ad8b9674e24260e917dc7d2ef (diff) | |
| parent | ee0ab46d327e278af68cbda49e00cd5188c709f3 (diff) | |
| download | gitlab-ce-eab086bde11f30551b4a8b27b0a344e654924a1c.tar.gz | |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index cfed797e725..7155dd2bea7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,6 +56,7 @@ # project_view :integer default(0) # consumed_timestep :integer # layout :integer default(0) +# hide_project_limit :boolean default(FALSE) # require 'carrierwave/orm/activerecord' |