summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/lib/utils/common_utils.js
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-13 11:09:20 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-13 11:09:20 +0100
commitdeb56f21cb5fc7ef9292d4307bc1618af0c1cb29 (patch)
tree6ab897e9057a9ac8edc690c0f848f3bb99c4490e /app/assets/javascripts/lib/utils/common_utils.js
parent9daf4f646b341480cc1b9c8452b41f1b933f98fc (diff)
downloadgitlab-ce-deb56f21cb5fc7ef9292d4307bc1618af0c1cb29.tar.gz
[ci skip] Use favicon full path
Diffstat (limited to 'app/assets/javascripts/lib/utils/common_utils.js')
-rw-r--r--app/assets/javascripts/lib/utils/common_utils.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index e1e6ca25446..5c7baf0a69b 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -364,9 +364,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);
}
};
@@ -382,7 +382,7 @@
dataType: 'json',
success: function(data) {
if (data && data.icon) {
- gl.utils.setFavicon(`ci_favicons/${data.icon}`);
+ gl.utils.setFavicon(data.favicon);
} else {
gl.utils.resetFavicon();
}