diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 16:22:08 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-18 16:22:08 +0000 |
commit | c15a2d7ffd9b3223e61fb24766cebf6d8935c739 (patch) | |
tree | 4e5b776bcc3ceb8ddb40a8c428dd39e489d38843 /app/assets/javascripts/lib | |
parent | bdc0fc7fff015ae8fe8a3fc21caa78b1e7850ded (diff) | |
parent | b544d8fade02ca826a55b8300e0a4c18fccbec01 (diff) | |
download | gitlab-ce-c15a2d7ffd9b3223e61fb24766cebf6d8935c739.tar.gz |
Merge branch 'use-favicon-full-path-for-pipeline-status-favicon' into 'master'
Use favicon full path
See merge request !10676
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index 33c900e264b..01c4b9821d3 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -368,9 +368,9 @@ }); }; - w.gl.utils.setFavicon = (iconName) => { - if (faviconEl && iconName) { - faviconEl.setAttribute('href', `/assets/${iconName}.ico`); + w.gl.utils.setFavicon = (faviconPath) => { + if (faviconEl && faviconPath) { + faviconEl.setAttribute('href', faviconPath); } }; @@ -385,8 +385,8 @@ url: pageUrl, dataType: 'json', success: function(data) { - if (data && data.icon) { - gl.utils.setFavicon(`ci_favicons/${data.icon}`); + if (data && data.favicon) { + gl.utils.setFavicon(data.favicon); } else { gl.utils.resetFavicon(); } |