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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
2a402a3e
Commit
2a402a3e
authored
Jun 18, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redirect favicon.(png|ico) to actual favicon asset or upload
parent
99fdbe4c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
0 deletions
+8
-0
config/routes.rb
config/routes.rb
+6
-0
doc/user/reserved_names.md
doc/user/reserved_names.md
+1
-0
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+1
-0
public/favicon.png
public/favicon.png
+0
-0
No files found.
config/routes.rb
View file @
2a402a3e
...
@@ -11,6 +11,12 @@ Rails.application.routes.draw do
...
@@ -11,6 +11,12 @@ Rails.application.routes.draw do
post
:toggle_award_emoji
,
on: :member
post
:toggle_award_emoji
,
on: :member
end
end
favicon_redirect
=
redirect
do
|
_params
,
_request
|
ActionController
::
Base
.
helpers
.
asset_url
(
Gitlab
::
Favicon
.
main
)
end
get
'favicon.png'
,
to:
favicon_redirect
get
'favicon.ico'
,
to:
favicon_redirect
draw
:sherlock
draw
:sherlock
draw
:development
draw
:development
draw
:ci
draw
:ci
...
...
doc/user/reserved_names.md
View file @
2a402a3e
...
@@ -58,6 +58,7 @@ Currently the following names are reserved as top level groups:
...
@@ -58,6 +58,7 @@ Currently the following names are reserved as top level groups:
-
dashboard
-
dashboard
-
deploy.html
-
deploy.html
-
explore
-
explore
-
favicon.ico
-
favicon.png
-
favicon.png
-
groups
-
groups
-
header_logo_dark.png
-
header_logo_dark.png
...
...
lib/gitlab/path_regex.rb
View file @
2a402a3e
...
@@ -30,6 +30,7 @@ module Gitlab
...
@@ -30,6 +30,7 @@ module Gitlab
dashboard
dashboard
deploy.html
deploy.html
explore
explore
favicon.ico
favicon.png
favicon.png
files
files
groups
groups
...
...
public/favicon.png
deleted
100644 → 0
View file @
99fdbe4c
1.57 KB
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