Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/app/serializers/detailed_status_entity.rb b/app/serializers/detailed_status_entity.rb
index ed8ac9f40f7..1f1a805af67 100644
--- a/app/serializers/detailed_status_entity.rb
+++ b/app/serializers/detailed_status_entity.rb
@@ -35,7 +35,7 @@ class DetailedStatusEntity < Grape::Entity
   expose :favicon,
     documentation: { type: 'string',
                      example: '/assets/ci_favicons/favicon_status_success.png' } do |status|
-    Gitlab::Favicon.status_overlay(status.favicon)
+    Gitlab::Favicon.ci_status_overlay(status.favicon)
   end
 
   expose :action, if: -> (status, _) { status.has_action? } do
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb
index 33079905ed2..a9c17402515 100644
--- a/app/serializers/merge_request_poll_cached_widget_entity.rb
+++ b/app/serializers/merge_request_poll_cached_widget_entity.rb
@@ -153,6 +153,19 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity
     end
   end
 
+  expose :favicon_overlay_path,
+    documentation: { type: 'string',
+                     example: '/assets/ci_favicons/favicon_status_success.png' } do |merge_request|
+    if merge_request.state == 'merged'
+      status_name = "favicon_status_#{merge_request.state}"
+      Gitlab::Favicon.mr_status_overlay(status_name)
+    else
+      pipeline = merge_request.actual_head_pipeline
+      status = pipeline&.detailed_status(request.current_user)
+      Gitlab::Favicon.ci_status_overlay(status.favicon) if status
+    end
+  end
+
   private
 
   delegate :current_user, to: :request