diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-10 12:28:15 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-10 22:31:48 +0300 |
| commit | 456e45010abef279a4766403dee14e018f8951da (patch) | |
| tree | ab08665eccf8b42895f89c13ff62217b9e67a1df /lib | |
| parent | 8de703b0162f3270e2407f64ecc8cb3ad52868a3 (diff) | |
Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'
Icon Sprite URL needs to be local even if asset_host is set
See merge request gitlab-org/gitlab-ce!15289
(cherry picked from commit e482a4d59dae6437a64ae4ccbe6976ffced7b9ba)
25eea058 Icon Sprite URL is also local even if asset_host is set
81eaf171 Fixed URL Matching in Tests
687e7dea Put Icons Path in Helper
fb1b88de Missing the local url
01240a18 Fixed Function + Test based on MR
fce34b4b Removed Brackets
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 3a666c2268b..dfcdfc307b6 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -20,7 +20,7 @@ module Gitlab gon.gitlab_url = Gitlab.config.gitlab.url gon.revision = Gitlab::REVISION gon.gitlab_logo = ActionController::Base.helpers.asset_path('gitlab_logo.png') - gon.sprite_icons = ActionController::Base.helpers.asset_path('icons.svg') + gon.sprite_icons = IconsHelper.sprite_icon_path if current_user gon.current_user_id = current_user.id |