diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:56 +0300 |
| commit | 045c0f9554a99c80d0a127540da168e272a9f977 (patch) | |
| tree | 2c4b0d10c9432e68b6c1aca2097e663ba18b48ec /lib/gitlab/gon_helper.rb | |
| parent | 669c24d9276db9a73bbcea40aeab98273aae9e5e (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index f22c69c531a..2e27e954e79 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -28,6 +28,7 @@ module Gitlab gon.sprite_file_icons = IconsHelper.sprite_file_icons_path gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites') gon.test_env = Rails.env.test? + 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.ee = Gitlab.ee? |