diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-15 16:43:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-15 16:43:48 +0000 |
| commit | 26810dd77111c396891d20f9a4c688bc05c84044 (patch) | |
| tree | 7653f1f9b3fe2d899c274cb219f26b8c2cc45678 /spec/models | |
| parent | 953608acb76a08285e5f7ad4c9321437a53b51fc (diff) | |
| parent | 5fc3b8a08d9264eedbf886c45b4ef7b418df380d (diff) | |
| download | gitlab-ce-26810dd77111c396891d20f9a4c688bc05c84044.tar.gz | |
Merge branch 'dm-remove-favicon-main-version' into 'master'
Remove FaviconUploader favicon_main version
See merge request gitlab-org/gitlab-ce!19891
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index b9f1c7dd5df..6c637533c6b 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -478,7 +478,7 @@ describe JiraService do create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png') props = described_class.new.send(:build_remote_link_props, url: 'http://example.com', title: 'title') - expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png$} + expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/dk.png$} end end end |