diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-13 08:56:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-13 08:56:24 +0000 |
| commit | 94ab99a8cfce419cf642be33ffca9c9ae8cb360e (patch) | |
| tree | a9b17485c7332c3c92449ea56be61f7a5508a37e | |
| parent | 474b502afe250e85942866d9a2fae18fb5b04583 (diff) | |
| parent | ff790ddf9a6e5dc5fbba050c2870eab370482890 (diff) | |
| download | gitlab-ce-94ab99a8cfce419cf642be33ffca9c9ae8cb360e.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 |