diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-15 19:43:48 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-15 19:43:48 +0300 |
| commit | 26810dd77111c396891d20f9a4c688bc05c84044 (patch) | |
| tree | 7653f1f9b3fe2d899c274cb219f26b8c2cc45678 /lib | |
| parent | 953608acb76a08285e5f7ad4c9321437a53b51fc (diff) | |
| parent | 5fc3b8a08d9264eedbf886c45b4ef7b418df380d (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']) |