diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-02 00:12:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-02 00:12:02 +0300 |
commit | 71722304bef22d1b162207e3e25e4109b0d0f8c1 (patch) | |
tree | a80189974f400946831c047ca5d4f018b9bacccc /lib/gitlab/gon_helper.rb | |
parent | 143a33345cf3607ad35ec31130cec4922bc1113c (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 ac3b4de0988..2bd59415771 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -27,6 +27,7 @@ module Gitlab gon.revision = Gitlab.revision gon.feature_category = Gitlab::ApplicationContext.current_context_attribute(:feature_category).presence gon.gitlab_logo = ActionController::Base.helpers.asset_path('gitlab_logo.png') + gon.secure = Gitlab.config.gitlab.https gon.sprite_icons = IconsHelper.sprite_icon_path gon.sprite_file_icons = IconsHelper.sprite_file_icons_path gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites') |