diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-13 08:56:24 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-13 20:37:30 -0500 |
| commit | c0b8f713045fbf12b40c102422dc68f3abd9e724 (patch) | |
| tree | 5715d71c547b9e8a4eb70524d295d7da4f219d3c | |
| parent | 39d2c850a3d8d9e8aea75d6f0d6c349e26f08d2a (diff) | |
| download | gitlab-ce-c0b8f713045fbf12b40c102422dc68f3abd9e724.tar.gz | |
Merge branch '53888-missing-favicon' into 'master'
Adds back missing CI favicon
Closes #53888
See merge request gitlab-org/gitlab-ce!23002
| -rw-r--r-- | app/assets/javascripts/jobs/store/actions.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/53888-missing-favicon.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js index 54ed217572a..8045f6dc3ff 100644 --- a/app/assets/javascripts/jobs/store/actions.js +++ b/app/assets/javascripts/jobs/store/actions.js @@ -80,8 +80,8 @@ export const fetchJob = ({ state, dispatch }) => { export const receiveJobSuccess = ({ commit }, data = {}) => { commit(types.RECEIVE_JOB_SUCCESS, data); - if (data.favicon) { - setFaviconOverlay(data.favicon); + if (data.status && data.status.favicon) { + setFaviconOverlay(data.status.favicon); } else { resetFavicon(); } diff --git a/changelogs/unreleased/53888-missing-favicon.yml b/changelogs/unreleased/53888-missing-favicon.yml new file mode 100644 index 00000000000..ba6f26c6b9f --- /dev/null +++ b/changelogs/unreleased/53888-missing-favicon.yml @@ -0,0 +1,5 @@ +--- +title: Adds CI favicon back to jobs page +merge_request: +author: +type: fixed |