summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2017-12-07 13:15:49 +0100
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:22 +0200
commit949c30d42b91a0dd3959a3ca303b8f76158a2556 (patch)
treef7a511a20399a065258aa8895852e58c85c4cef0 /spec/features
parent9e14f437b6ed205744d916f5566ee2c11e52b734 (diff)
downloadgitlab-ce-949c30d42b91a0dd3959a3ca303b8f76158a2556.tar.gz
remove all .ico favicon variations, use png always
the ci status icons are generated client side, wo we don't need the static files anymore.
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_request/user_creates_image_diff_notes_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
index 7c4fd25bb39..25c408516d1 100644
--- a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
@@ -12,7 +12,7 @@ feature 'Merge request > User creates image diff notes', :js do
# Stub helper to return any blob file as image from public app folder.
# This is necessary to run this specs since we don't display repo images in capybara.
allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_url).and_return('/apple-touch-icon.png')
- allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.ico')
+ allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.png')
end
context 'create commit diff notes' do