summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-11-12 16:59:20 -0500
committerFilipa Lacerda <filipa@gitlab.com>2018-11-12 17:00:20 -0500
commitff790ddf9a6e5dc5fbba050c2870eab370482890 (patch)
treee97bde836e8228b28cf2a73e03a7d255631f4ae7
parentec3712c20167d40cb40b6932abb51ba0d4f58c20 (diff)
downloadgitlab-ce-53888-missing-favicon.tar.gz
Adds back missing CI favicon53888-missing-favicon
The CI favicon was missing in the jobs page. This commit fixes it. Closes #53888
-rw-r--r--app/assets/javascripts/jobs/store/actions.js4
-rw-r--r--changelogs/unreleased/53888-missing-favicon.yml5
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