call Gitlab::Favicon.status in serializer

this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.

also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb
index 8802f58e31c..51a25b408ee 100644
--- a/lib/gitlab/favicon.rb
+++ b/lib/gitlab/favicon.rb
@@ -1,8 +1,8 @@
 module Gitlab
   class Favicon
     class << self
-      def default
-        return custom_favicon_url(appearance_favicon.default.url) if appearance_favicon.exists?
+      def main
+        return custom_favicon_url(appearance_favicon.favicon_main.url) if appearance_favicon.exists?
         return 'favicon-yellow.ico' if Gitlab::Utils.to_boolean(ENV['CANARY'])
         return 'favicon-blue.ico' if Rails.env.development?
 
@@ -11,13 +11,16 @@ module Gitlab
 
       def status(status_name)
         if appearance_favicon.exists?
-          custom_favicon_url(appearance_favicon.public_send("status_#{status_name}").url) # rubocop:disable GitlabSecurity/PublicSend
+          custom_favicon_url(appearance_favicon.public_send("#{status_name}").url) # rubocop:disable GitlabSecurity/PublicSend
         else
-          dir = 'ci_favicons'
-          dir = File.join(dir, 'dev') if Rails.env.development?
-          dir = File.join(dir, 'canary') if Gitlab::Utils.to_boolean(ENV['CANARY'])
+          path = File.join(
+            'ci_favicons',
+            Rails.env.development? ? 'dev' : '',
+            Gitlab::Utils.to_boolean(ENV['CANARY']) ? 'canary' : '',
+            "#{status_name}.ico"
+          )
 
-          File.join(dir, "favicon_status_#{status_name}.ico")
+          ActionController::Base.helpers.image_path(path)
         end
       end