Merge two partials into one. Rename it to match the other partials

app/views/ci/status/_icon_with_name.html.haml → app/views/ci/status/_badge_graph_icon_with_name_and_action.html.haml

@@ -3,9 +3,16 @@
 - klass = "ci-status-icon ci-status-icon-#{detailed_status}"
 
 - if details_path
-  = link_to details_path, class: klass, data: { toggle: 'tooltip', title: "#{subject.name} - #{detailed_status}" } do
+  = link_to details_path, class: klass,
+    data: { toggle: 'tooltip', title: "#{subject.name} - #{detailed_status}" } do
     %span{ class: klass }= custom_icon(detailed_status.icon)
     .ci-status-text= subject.name
 - else
   %span{ class: klass }= custom_icon(detailed_status.icon)
   .ci-status-text= subject.name
+
+- if detailed_status.has_action?
+  = link_to detailed_status.action_path, method: detailed_status.action_method,
+    title: "#{subject.name}: #{detailed_status.action_title}", class: 'ci-action-icon-container' do
+    %i.ci-action-icon-wrapper
+      = icon(detailed_status.action_icon, class: detailed_status.action_class)

app/views/ci/status/_icon_with_name_and_action.html.haml

-= render "ci/status/icon_with_name", subject: subject
-
-- detailed_status = subject.detailed_status(current_user)
-- if detailed_status.has_action?
-  = link_to detailed_status.action_path, method: detailed_status.action_method,
-    title: "#{subject.name}: #{detailed_status.action_title}", class: 'ci-action-icon-container' do
-    %i.ci-action-icon-wrapper
-      = icon(detailed_status.action_icon, class: detailed_status.action_class)

app/views/projects/stage/_graph.html.haml

@@ -13,7 +13,7 @@
           %li.build
             .curve
             .build-content
-              = render 'ci/status/icon_with_name_and_action', subject: status
+              = render 'ci/status/bagde_graph_icon_with_name_and_action', subject: status
         - else
           %li.build
             .curve

app/views/projects/stage/_in_stage_group.html.haml

@@ -10,4 +10,4 @@
   %ul
     - subject.each do |status|
       %li.dropdown-build
-        = render 'ci/status/icon_with_name_and_action', subject: status
+        = render 'ci/status/bagde_graph_icon_with_name_and_action', subject: status