diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-05-14 09:16:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-05-14 09:16:21 +0000 |
| commit | 568999e6886db4c94d21d974b49f1f89e547e013 (patch) | |
| tree | 04b4e10de72b5281178444cbdbefb224e8f45693 | |
| parent | 99637084b22abdf7b1f6d46daad80faf8181f3cd (diff) | |
| parent | e48305c02c5ed566ed6d98ff82e0d897a692008d (diff) | |
| download | gitlab-ce-568999e6886db4c94d21d974b49f1f89e547e013.tar.gz | |
Merge branch 'single-codebase-favicon-specs-ce' into 'master'
EE Backport to CE of EE!12404
See merge request gitlab-org/gitlab-ce!28292
| -rw-r--r-- | spec/lib/gitlab/favicon_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb index 49a423191bb..dce56bbd2c4 100644 --- a/spec/lib/gitlab/favicon_spec.rb +++ b/spec/lib/gitlab/favicon_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Gitlab::Favicon, :request_store do expect(described_class.main).to match_asset_path '/assets/favicon.png' end - it 'has blue favicon for development' do + it 'has blue favicon for development', unless: Gitlab.ee? do allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development')) expect(described_class.main).to match_asset_path '/assets/favicon-blue.png' end |