summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-06-15 12:28:23 +0200
committerDouwe Maan <douwe@selenight.nl>2018-06-15 12:28:23 +0200
commit5fc3b8a08d9264eedbf886c45b4ef7b418df380d (patch)
tree43a12031b52f267237f2539b42815c33061f82ea /lib
parenta8445cc29d81f8d8169e93cd4ef6692aa0fef1fb (diff)
downloadgitlab-ce-5fc3b8a08d9264eedbf886c45b4ef7b418df380d.tar.gz
Remove FaviconUploader favicon_main versiondm-remove-favicon-main-version
See https://gitlab.com/gitlab-org/gitlab-ce/issues/47677 for more information
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/favicon.rb2
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'])