diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 18:44:42 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 18:44:42 +0300 |
| commit | 9b177bb7c94df6c7d3868235f75939a41acf8718 (patch) | |
| tree | ef8541d3ef8047f2ac6711b6e030244f812b7b49 /app/models/user.rb | |
| parent | 73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff) | |
Revert "Merge branch 'revert-f2421b2b' into 'master'"
This reverts merge request !14148
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 358b04ac71f..09c9b3250eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,6 +35,7 @@ class User < ActiveRecord::Base default_value_for :project_view, :files default_value_for :notified_of_own_activity, false default_value_for :preferred_language, I18n.default_locale + default_value_for :theme_id, gitlab_config.default_theme attr_encrypted :otp_secret, key: Gitlab::Application.secrets.otp_key_base, |