Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 0 deletions

diff --git a/app/views/shared/integrations/_integrations.html.haml b/app/views/shared/integrations/_integrations.html.haml
new file mode 100644
index 00000000000..b2359aca016
--- /dev/null
+++ b/app/views/shared/integrations/_integrations.html.haml
@@ -0,0 +1,26 @@
+%table.table.b-table.gl-table.mt-3{ role: 'table', 'aria-busy': false, 'aria-colcount': 4 }
+  %colgroup
+    %col
+    %col
+    %col.d-none.d-sm-table-column
+    %col{ width: 120 }
+  %thead{ role: 'rowgroup' }
+    %tr{ role: 'row' }
+      %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 1 }
+      %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 2 }= _('Integration')
+      %th.d-none.d-sm-block{ role: 'columnheader', scope: 'col', 'aria-colindex': 3 }= _('Description')
+      %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 4 }= _('Last updated')
+
+  %tbody{ role: 'rowgroup' }
+    - integrations.each do |integration|
+      %tr{ role: 'row' }
+        %td{ role: 'cell', 'aria-colindex': 1 }
+          = boolean_to_icon integration.activated?
+        %td{ role: 'cell', 'aria-colindex': 2 }
+          = link_to scoped_edit_integration_path(integration) do
+            %strong= integration.title
+        %td.d-none.d-sm-block{ role: 'cell', 'aria-colindex': 3 }
+          = integration.description
+        %td{ role: 'cell', 'aria-colindex': 4 }
+          - if integration.updated_at.present?
+            = time_ago_with_tooltip integration.updated_at