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
9fa97202
Commit
9fa97202
authored
Mar 03, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ee-specific-dev-favicon' into 'master'
Adds a EE specific dev favicon See merge request !1343
parents
a3049e55
f3b5d68f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/images/favicon-blue.ico
app/assets/images/favicon-blue.ico
+0
-0
app/assets/images/favicon-green.ico
app/assets/images/favicon-green.ico
+0
-0
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+1
-1
changelogs/unreleased-ee/ee-specific-dev-favicon.yml
changelogs/unreleased-ee/ee-specific-dev-favicon.yml
+4
-0
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+1
-1
No files found.
app/assets/images/favicon-blue.ico
deleted
100755 → 0
View file @
a3049e55
5.3 KB
app/assets/images/favicon-green.ico
0 → 100755
View file @
9fa97202
5.3 KB
app/helpers/page_layout_helper.rb
View file @
9fa97202
...
...
@@ -35,7 +35,7 @@ module PageLayoutHelper
end
def
favicon
Rails
.
env
.
development?
?
'favicon-
blue
.ico'
:
'favicon.ico'
Rails
.
env
.
development?
?
'favicon-
green
.ico'
:
'favicon.ico'
end
def
page_image
...
...
changelogs/unreleased-ee/ee-specific-dev-favicon.yml
0 → 100644
View file @
9fa97202
---
title
:
Adds a EE specific dev favicon
merge_request
:
author
:
spec/helpers/page_layout_helper_spec.rb
View file @
9fa97202
...
...
@@ -48,7 +48,7 @@ describe PageLayoutHelper 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-
blue
.ico'
expect
(
helper
.
favicon
).
to
eq
'favicon-
green
.ico'
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