From f5e8d6bded71a0ed827c2f1becb3a3a81ad1f163 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 25 Apr 2017 17:15:41 +0100 Subject: updated to new favicons --- .../ci_favicons/dev/favicon_status_canceled.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_created.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_failed.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_manual.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_pending.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_running.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_skipped.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_success.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/dev/favicon_status_warning.ico | Bin 0 -> 4286 bytes .../images/ci_favicons/favicon_status_canceled.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_created.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_failed.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_manual.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_pending.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_running.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_skipped.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_success.ico | Bin 5430 -> 4286 bytes .../images/ci_favicons/favicon_status_warning.ico | Bin 5430 -> 4286 bytes app/serializers/status_entity.rb | 5 ++++- 19 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_canceled.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_created.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_failed.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_manual.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_pending.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_running.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_skipped.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_success.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_warning.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_canceled.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_created.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_failed.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_manual.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_pending.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_running.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_skipped.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_success.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_warning.ico diff --git a/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico b/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico new file mode 100644 index 00000000000..4af3582b60d Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_created.ico b/app/assets/images/ci_favicons/dev/favicon_status_created.ico new file mode 100644 index 00000000000..13639da2e8a Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_created.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_failed.ico b/app/assets/images/ci_favicons/dev/favicon_status_failed.ico new file mode 100644 index 00000000000..5f0e711b104 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_failed.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_manual.ico b/app/assets/images/ci_favicons/dev/favicon_status_manual.ico new file mode 100644 index 00000000000..8b1168a1267 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_manual.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_pending.ico b/app/assets/images/ci_favicons/dev/favicon_status_pending.ico new file mode 100644 index 00000000000..5dfefd4cc5a Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_pending.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_running.ico b/app/assets/images/ci_favicons/dev/favicon_status_running.ico new file mode 100644 index 00000000000..a41539c0e3e Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_running.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico b/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico new file mode 100644 index 00000000000..2c1ae552b93 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_success.ico b/app/assets/images/ci_favicons/dev/favicon_status_success.ico new file mode 100644 index 00000000000..70f0ca61eca Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_success.ico differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_warning.ico b/app/assets/images/ci_favicons/dev/favicon_status_warning.ico new file mode 100644 index 00000000000..db289e03eb1 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_warning.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_canceled.ico b/app/assets/images/ci_favicons/favicon_status_canceled.ico old mode 100755 new mode 100644 index 5a19458f2a2..23adcffff50 Binary files a/app/assets/images/ci_favicons/favicon_status_canceled.ico and b/app/assets/images/ci_favicons/favicon_status_canceled.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_created.ico b/app/assets/images/ci_favicons/favicon_status_created.ico old mode 100755 new mode 100644 index 4dca9640cb3..f9d93b390d8 Binary files a/app/assets/images/ci_favicons/favicon_status_created.ico and b/app/assets/images/ci_favicons/favicon_status_created.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_failed.ico b/app/assets/images/ci_favicons/favicon_status_failed.ico old mode 100755 new mode 100644 index c961ff9a69b..28a22ebf724 Binary files a/app/assets/images/ci_favicons/favicon_status_failed.ico and b/app/assets/images/ci_favicons/favicon_status_failed.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_manual.ico b/app/assets/images/ci_favicons/favicon_status_manual.ico old mode 100755 new mode 100644 index 5fbbc99ea7c..dbbf1abf30c Binary files a/app/assets/images/ci_favicons/favicon_status_manual.ico and b/app/assets/images/ci_favicons/favicon_status_manual.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_pending.ico b/app/assets/images/ci_favicons/favicon_status_pending.ico old mode 100755 new mode 100644 index 8be32dab85a..05962f3f148 Binary files a/app/assets/images/ci_favicons/favicon_status_pending.ico and b/app/assets/images/ci_favicons/favicon_status_pending.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_running.ico b/app/assets/images/ci_favicons/favicon_status_running.ico old mode 100755 new mode 100644 index f328ff1a5ed..7fa3d4d48d4 Binary files a/app/assets/images/ci_favicons/favicon_status_running.ico and b/app/assets/images/ci_favicons/favicon_status_running.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_skipped.ico b/app/assets/images/ci_favicons/favicon_status_skipped.ico old mode 100755 new mode 100644 index b4394e1b4af..b0c26b62068 Binary files a/app/assets/images/ci_favicons/favicon_status_skipped.ico and b/app/assets/images/ci_favicons/favicon_status_skipped.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_success.ico b/app/assets/images/ci_favicons/favicon_status_success.ico old mode 100755 new mode 100644 index 4f436c95242..b150960b5be Binary files a/app/assets/images/ci_favicons/favicon_status_success.ico and b/app/assets/images/ci_favicons/favicon_status_success.ico differ diff --git a/app/assets/images/ci_favicons/favicon_status_warning.ico b/app/assets/images/ci_favicons/favicon_status_warning.ico old mode 100755 new mode 100644 index 805cc20cdec..7e71d71684d Binary files a/app/assets/images/ci_favicons/favicon_status_warning.ico and b/app/assets/images/ci_favicons/favicon_status_warning.ico differ diff --git a/app/serializers/status_entity.rb b/app/serializers/status_entity.rb index 944472f3e51..188c3747f18 100644 --- a/app/serializers/status_entity.rb +++ b/app/serializers/status_entity.rb @@ -7,6 +7,9 @@ class StatusEntity < Grape::Entity expose :details_path expose :favicon do |status| - ActionController::Base.helpers.image_path(File.join('ci_favicons', "#{status.favicon}.ico")) + dir = 'ci_favicons' + dir = File.join(dir, 'dev') if Rails.env.development? + + ActionController::Base.helpers.image_path(File.join(dir, "#{status.favicon}.ico")) end end -- cgit v1.2.1 From a14e28abe059cd48b91156227d1ae7f1fbc699fa Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 25 Apr 2017 18:36:05 +0100 Subject: Added test --- spec/serializers/status_entity_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/serializers/status_entity_spec.rb b/spec/serializers/status_entity_spec.rb index c94902dbab8..3964b998084 100644 --- a/spec/serializers/status_entity_spec.rb +++ b/spec/serializers/status_entity_spec.rb @@ -18,6 +18,12 @@ describe StatusEntity do it 'contains status details' do expect(subject).to include :text, :icon, :favicon, :label, :group expect(subject).to include :has_details, :details_path + expect(subject[:favicon]).to eq('/assets/ci_favicons/favicon_status_success.ico') + end + + it 'contains a dev namespaced favicon if dev env' do + allow(Rails.env).to receive(:development?) { true } + expect(entity.as_json[:favicon]).to eq('/assets/ci_favicons/dev/favicon_status_success.ico') end end end -- cgit v1.2.1 From 6d5095332c65684474d204315f01cc165593f668 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Mon, 1 May 2017 15:49:12 +0530 Subject: added not-found status favicons --- app/assets/images/ci_favicons/dev/favicon-notfound.ico | Bin 0 -> 4286 bytes app/assets/images/ci_favicons/favicon-notfound.ico | Bin 0 -> 4286 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/ci_favicons/dev/favicon-notfound.ico create mode 100644 app/assets/images/ci_favicons/favicon-notfound.ico diff --git a/app/assets/images/ci_favicons/dev/favicon-notfound.ico b/app/assets/images/ci_favicons/dev/favicon-notfound.ico new file mode 100644 index 00000000000..ed19b69e1c5 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon-notfound.ico differ diff --git a/app/assets/images/ci_favicons/favicon-notfound.ico b/app/assets/images/ci_favicons/favicon-notfound.ico new file mode 100644 index 00000000000..49b9b232dd1 Binary files /dev/null and b/app/assets/images/ci_favicons/favicon-notfound.ico differ -- cgit v1.2.1 From 42e0a8cfa500306f84956dc2c0f8c675cbad53ee Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Mon, 1 May 2017 14:42:37 +0100 Subject: Renamed notfound favicon name --- .../images/ci_favicons/dev/favicon-notfound.ico | Bin 4286 -> 0 bytes .../ci_favicons/dev/favicon_status_not_found.ico | Bin 0 -> 4286 bytes app/assets/images/ci_favicons/favicon-notfound.ico | Bin 4286 -> 0 bytes .../images/ci_favicons/favicon_status_not_found.ico | Bin 5430 -> 4286 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/images/ci_favicons/dev/favicon-notfound.ico create mode 100644 app/assets/images/ci_favicons/dev/favicon_status_not_found.ico delete mode 100644 app/assets/images/ci_favicons/favicon-notfound.ico mode change 100755 => 100644 app/assets/images/ci_favicons/favicon_status_not_found.ico diff --git a/app/assets/images/ci_favicons/dev/favicon-notfound.ico b/app/assets/images/ci_favicons/dev/favicon-notfound.ico deleted file mode 100644 index ed19b69e1c5..00000000000 Binary files a/app/assets/images/ci_favicons/dev/favicon-notfound.ico and /dev/null differ diff --git a/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico b/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico new file mode 100644 index 00000000000..ed19b69e1c5 Binary files /dev/null and b/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico differ diff --git a/app/assets/images/ci_favicons/favicon-notfound.ico b/app/assets/images/ci_favicons/favicon-notfound.ico deleted file mode 100644 index 49b9b232dd1..00000000000 Binary files a/app/assets/images/ci_favicons/favicon-notfound.ico and /dev/null differ diff --git a/app/assets/images/ci_favicons/favicon_status_not_found.ico b/app/assets/images/ci_favicons/favicon_status_not_found.ico old mode 100755 new mode 100644 index 21afa9c72e6..49b9b232dd1 Binary files a/app/assets/images/ci_favicons/favicon_status_not_found.ico and b/app/assets/images/ci_favicons/favicon_status_not_found.ico differ -- cgit v1.2.1 From 5f33903b1ea4cf5a1fe551467151556336f17493 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 2 May 2017 10:48:06 +0100 Subject: [ci skip] Added changelog entry --- changelogs/unreleased/add-tanuki-ci-status-favicons.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/add-tanuki-ci-status-favicons.yml diff --git a/changelogs/unreleased/add-tanuki-ci-status-favicons.yml b/changelogs/unreleased/add-tanuki-ci-status-favicons.yml new file mode 100644 index 00000000000..b60ad81947a --- /dev/null +++ b/changelogs/unreleased/add-tanuki-ci-status-favicons.yml @@ -0,0 +1,4 @@ +--- +title: Updated CI status favicons to include the tanuki +merge_request: 10923 +author: -- cgit v1.2.1