summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-02-16 06:55:52 +1100
committerSimon Knox <psimyn@gmail.com>2017-02-16 06:55:52 +1100
commit679ce9dbb35021bec3bc048948e471ba3989e518 (patch)
tree365d758db0a0c4e3bc5dd035fa1c2df364fad85a
parente15032eded3b35097409817ddb1844164173ce1a (diff)
downloadgitlab-ce-679ce9dbb35021bec3bc048948e471ba3989e518.tar.gz
dev favicon is blue, not purple27281-devicon
-rw-r--r--app/assets/images/favicon-blue.ico (renamed from app/assets/images/favicon-purple.ico)bin5430 -> 5430 bytes
-rw-r--r--app/helpers/page_layout_helper.rb2
-rw-r--r--spec/helpers/page_layout_helper_spec.rb4
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/images/favicon-purple.ico b/app/assets/images/favicon-blue.ico
index 71acdf670ab..71acdf670ab 100644
--- a/app/assets/images/favicon-purple.ico
+++ b/app/assets/images/favicon-blue.ico
Binary files differ
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index aee8099aeb2..3286a92a8a7 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -35,7 +35,7 @@ module PageLayoutHelper
end
def favicon
- Rails.env.development? ? 'favicon-purple.ico' : 'favicon.ico'
+ Rails.env.development? ? 'favicon-blue.ico' : 'favicon.ico'
end
def page_image
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 872679a6ce3..2cc0b40b2d0 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -46,9 +46,9 @@ describe PageLayoutHelper do
expect(helper.favicon).to eq 'favicon.ico'
end
- it 'has purple favicon for development' do
+ it 'has blue favicon for development' do
allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
- expect(helper.favicon).to eq 'favicon-purple.ico'
+ expect(helper.favicon).to eq 'favicon-blue.ico'
end
end