diff options
| author | Fabian Schneider <fabbbbbi+git@googlemail.com> | 2019-01-10 22:06:42 +0100 |
|---|---|---|
| committer | Fabian Schneider <fabbbbbi+git@googlemail.com> | 2019-02-06 17:33:57 +0100 |
| commit | 864ce6b87ad610ac0bace900bb7e9ebcc0d63983 (patch) | |
| tree | 13fcf0649e07851aed7013a130e5e7452c8c45cc /lib | |
| parent | 8fabc92e8b4779030c4fa09d8e1c72f213814787 (diff) | |
| download | gitlab-ce-864ce6b87ad610ac0bace900bb7e9ebcc0d63983.tar.gz | |
Rename setting, fix wordings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index f0af5329d76..3235d3ccc4e 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -24,14 +24,13 @@ module Gitlab gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites') gon.test_env = Rails.env.test? gon.suggested_label_colors = LabelsHelper.suggested_colors - gon.first_day_of_week = Gitlab::CurrentSettings.default_first_day_of_week + gon.first_day_of_week = current_user&.first_day_of_week || Gitlab::CurrentSettings.first_day_of_week if current_user gon.current_user_id = current_user.id gon.current_username = current_user.username gon.current_user_fullname = current_user.name gon.current_user_avatar_url = current_user.avatar_url - gon.first_day_of_week = current_user.first_day_of_week if current_user.first_day_of_week end end |