diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-10 16:57:55 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-10 16:57:55 +0300 |
commit | 9c576cc7e9414e64b4aac0544615e7d5e92c3558 (patch) | |
tree | 18acbfda089391720996f5f23868b9e25e11f310 /app | |
parent | 481f07e77c11e24b6e99c2a23639041061e78c23 (diff) | |
parent | fede01fb5ef488c387efe307c2453bd5aa34c073 (diff) |
Merge branch 'ci-favicon-back-in' into 'master'
Added back in the CI status favicon
See merge request !10534
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/build.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 9e7df9ad350..0aad95c2fe3 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -90,6 +90,8 @@ window.Build = (function () { success: ((log) => { const $buildContainer = $('.js-build-output'); + gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`); + if (log.state) { this.state = log.state; } |