diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-18 15:58:36 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-18 15:58:36 +0300 |
| commit | 3c725a2a5d340a2edae8a79ad6af3a0924cc8f14 (patch) | |
| tree | c27d77bd6966cc4b0a7a1c02a38de4483fcee08f /lib/gitlab | |
| parent | d222bafee0326768fdfc5683a394c9979369c0ef (diff) | |
| parent | 2a402a3e503b3c564b4e9dcbf9d7ede1d2291937 (diff) | |
Merge branch 'dm-favicon-redirect' into 'master'
Redirect favicon.(png|ico) to actual favicon asset or upload
Closes #47840
See merge request gitlab-org/gitlab-ce!19956
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index e5191f5c7f9..61653044433 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -30,6 +30,7 @@ module Gitlab dashboard deploy.html explore + favicon.ico favicon.png files groups |