Merge branch 'integrations-page-cleanup' into 'master'

Use GitLab UI styles on Integrations page

See merge request gitlab-org/gitlab!47478

app/helpers/icons_helper.rb

@@ -80,9 +80,9 @@ module IconsHelper
 
   def boolean_to_icon(value)
     if value
-      sprite_icon('check', css_class: 'cgreen')
+      sprite_icon('check', css_class: 'gl-text-green-500')
     else
-      sprite_icon('power', css_class: 'clgray')
+      sprite_icon('power', css_class: 'gl-text-gray-500')
     end
   end
 

app/views/shared/integrations/_index.html.haml

-%table.table.b-table.gl-table.mt-3{ role: 'table', 'aria-busy': false, 'aria-colcount': 4 }
+%table.table.b-table.gl-table{ role: 'table', 'aria-busy': false, 'aria-colcount': 4 }
   %colgroup
     %col
     %col
@@ -15,11 +15,10 @@
     - integrations.each do |integration|
       - activated_label = (integration.activated? ? s_("ProjectService|%{service_title}: status on") : s_("ProjectService|%{service_title}: status off")) % { service_title: integration.title }
       %tr{ role: 'row' }
-        %td{ role: 'cell', 'aria-colindex': 1, 'aria-label': activated_label }
+        %td{ role: 'cell', 'aria-colindex': 1, 'aria-label': activated_label, title: activated_label }
           = boolean_to_icon integration.operating?
         %td{ role: 'cell', 'aria-colindex': 2 }
-          = link_to scoped_edit_integration_path(integration), { data: { qa_selector: "#{integration.to_param}_link" } } do
-            %strong= integration.title
+          = link_to integration.title, scoped_edit_integration_path(integration), class: 'gl-font-weight-bold', data: { qa_selector: "#{integration.to_param}_link" }
         %td.d-none.d-sm-table-cell{ role: 'cell', 'aria-colindex': 3 }
           = integration.description
         %td{ role: 'cell', 'aria-colindex': 4 }

changelogs/unreleased/integrations-page-cleanup.yml

+---
+title: Use GitLab UI styles on Integrations page
+merge_request: 47478
+author:
+type: changed

qa/qa/ee/page/project/settings/integrations.rb

@@ -11,7 +11,7 @@ module QA
             def self.prepended(base)
               base.class_eval do
                 view 'app/views/shared/integrations/_index.html.haml' do
-                  element :jenkins_link, '{ data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
+                  element :jenkins_link, 'data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
                 end
               end
             end

qa/qa/page/project/settings/integrations.rb

@@ -6,8 +6,8 @@ module QA
       module Settings
         class Integrations < QA::Page::Base
           view 'app/views/shared/integrations/_index.html.haml' do
-            element :prometheus_link, '{ data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
-            element :jira_link, '{ data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
+            element :prometheus_link, 'data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
+            element :jira_link, 'data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
           end
 
           def click_on_prometheus_integration