diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 12:09:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 12:09:33 +0300 |
commit | 7752bfa10fc817c6455f7e287d233fb6cd61a599 (patch) | |
tree | ec1871921f6f0040789478d95dfe4f286f482533 /lib/gitlab/gon_helper.rb | |
parent | cf1382025171f9e5f9147fdfbbff1d9f230a9fdd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gon_helper.rb')
-rw-r--r-- | lib/gitlab/gon_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 8f2ba71e9ff..16a8b5f959e 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -33,6 +33,7 @@ module Gitlab gon.disable_animations = Gitlab.config.gitlab['disable_animations'] gon.suggested_label_colors = LabelsHelper.suggested_colors gon.first_day_of_week = current_user&.first_day_of_week || Gitlab::CurrentSettings.first_day_of_week + gon.time_display_relative = true gon.ee = Gitlab.ee? gon.dot_com = Gitlab.com? @@ -41,6 +42,7 @@ module Gitlab gon.current_username = current_user.username gon.current_user_fullname = current_user.name gon.current_user_avatar_url = current_user.avatar_url + gon.time_display_relative = current_user.time_display_relative end # Initialize gon.features with any flags that should be |