diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-07 19:54:41 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-07 19:54:41 +0300 |
| commit | 290ca339adc952bcd939d1782af95f90d3b88716 (patch) | |
| tree | 99d6b6bc75727949f1d3410bef321d31406668ca /spec/features/merge_request | |
| parent | 7b562c972713d19c2e537eb4df7cbe072ada8bbe (diff) | |
| parent | 366e1331692900300df42e9c38fc17bd46b7ca1c (diff) | |
Merge branch 'feature/customizable-favicon' into 'master'
Customizable favicon
Closes #15661
See merge request gitlab-org/gitlab-ce!14497
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_creates_image_diff_notes_spec.rb | 2 |
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 |