Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
679ce9db
Commit
679ce9db
authored
Feb 16, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev favicon is blue, not purple
parent
e15032ed
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/images/favicon-blue.ico
app/assets/images/favicon-blue.ico
+0
-0
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+1
-1
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+2
-2
No files found.
app/assets/images/favicon-
purpl
e.ico
→
app/assets/images/favicon-
blu
e.ico
View file @
679ce9db
File moved
app/helpers/page_layout_helper.rb
View file @
679ce9db
...
@@ -35,7 +35,7 @@ module PageLayoutHelper
...
@@ -35,7 +35,7 @@ module PageLayoutHelper
end
end
def
favicon
def
favicon
Rails
.
env
.
development?
?
'favicon-
purpl
e.ico'
:
'favicon.ico'
Rails
.
env
.
development?
?
'favicon-
blu
e.ico'
:
'favicon.ico'
end
end
def
page_image
def
page_image
...
...
spec/helpers/page_layout_helper_spec.rb
View file @
679ce9db
...
@@ -46,9 +46,9 @@ describe PageLayoutHelper do
...
@@ -46,9 +46,9 @@ describe PageLayoutHelper do
expect
(
helper
.
favicon
).
to
eq
'favicon.ico'
expect
(
helper
.
favicon
).
to
eq
'favicon.ico'
end
end
it
'has
purpl
e favicon for development'
do
it
'has
blu
e favicon for development'
do
allow
(
Rails
).
to
receive
(
:env
).
and_return
(
ActiveSupport
::
StringInquirer
.
new
(
'development'
))
allow
(
Rails
).
to
receive
(
:env
).
and_return
(
ActiveSupport
::
StringInquirer
.
new
(
'development'
))
expect
(
helper
.
favicon
).
to
eq
'favicon-
purpl
e.ico'
expect
(
helper
.
favicon
).
to
eq
'favicon-
blu
e.ico'
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment