diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-05 16:59:31 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-05 16:59:31 +0300 |
| commit | 5004579b15b0585c0a26231d7422fb1d8086bd66 (patch) | |
| tree | b9d0096b88813af0d2cb38c173485f56aa62ebc7 /app/models/user.rb | |
| parent | 79b8323d11cc06911b996f327c6e06fd29cafea4 (diff) | |
| parent | 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 (diff) | |
| download | gitlab-ce-5004579b15b0585c0a26231d7422fb1d8086bd66.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]
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 6015643b565..59f2be3ba9d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,6 +23,7 @@ class User < ActiveRecord::Base default_value_for :hide_no_password, false default_value_for :project_view, :files default_value_for :notified_of_own_activity, false + default_value_for :preferred_language, I18n.default_locale attr_encrypted :otp_secret, key: Gitlab::Application.secrets.otp_key_base, |