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
46328b12
Commit
46328b12
authored
Apr 09, 2018
by
Alexis Reigel
Committed by
Alexis Reigel
Jun 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
the '?' favicon hack doesn't seem to be required
probably due to recent changes in `UploadsController`.
parent
b4d84c07
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
8 deletions
+1
-8
lib/gitlab/favicon.rb
lib/gitlab/favicon.rb
+1
-8
No files found.
lib/gitlab/favicon.rb
View file @
46328b12
...
@@ -2,7 +2,7 @@ module Gitlab
...
@@ -2,7 +2,7 @@ module Gitlab
class
Favicon
class
Favicon
class
<<
self
class
<<
self
def
main
def
main
return
custom_favicon_url
(
appearance_favicon
.
favicon_main
.
url
)
if
appearance_favicon
.
exists?
return
appearance_favicon
.
favicon_main
.
url
if
appearance_favicon
.
exists?
return
ActionController
::
Base
.
helpers
.
image_path
(
'favicon-yellow.png'
)
if
Gitlab
::
Utils
.
to_boolean
(
ENV
[
'CANARY'
])
return
ActionController
::
Base
.
helpers
.
image_path
(
'favicon-yellow.png'
)
if
Gitlab
::
Utils
.
to_boolean
(
ENV
[
'CANARY'
])
return
ActionController
::
Base
.
helpers
.
image_path
(
'favicon-blue.png'
)
if
Rails
.
env
.
development?
return
ActionController
::
Base
.
helpers
.
image_path
(
'favicon-blue.png'
)
if
Rails
.
env
.
development?
...
@@ -35,13 +35,6 @@ module Gitlab
...
@@ -35,13 +35,6 @@ module Gitlab
def
appearance_favicon
def
appearance_favicon
appearance
.
favicon
appearance
.
favicon
end
end
# Without the '?' at the end of the favicon url the custom favicon (i.e.
# the favicons that are served through `UploadController`) are not shown
# in the browser.
def
custom_favicon_url
(
url
)
"
#{
url
}
?"
end
end
end
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