diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-15 19:43:48 +0300 |
|---|---|---|
| committer | Chris Peressini <cperessini@gitlab.com> | 2018-06-18 12:08:25 +0300 |
| commit | b398fed43b2a5030dd9e0907ef0a3385340e5afe (patch) | |
| tree | a6940832fcc490f41caa43c00e4173fa56069ceb /lib | |
| parent | 5738eab5d450a0ea89d938612462cae82870517d (diff) | |
Merge branch 'dm-remove-favicon-main-version' into 'master'
Remove FaviconUploader favicon_main version
See merge request gitlab-org/gitlab-ce!19891
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/favicon.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index 451c9daf761..faf7016d73a 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -2,7 +2,7 @@ module Gitlab class Favicon class << self def main - return appearance_favicon.favicon_main.url if appearance_favicon.exists? + return appearance_favicon.url if appearance_favicon.exists? image_name = if Gitlab::Utils.to_boolean(ENV['CANARY']) |