Add latest changes from gitlab-org/gitlab@master

9 files changed, 40 insertions, 28 deletions

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index eb09d31fab9..212e34658c2 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-c6e8f5d546e404086299802237030b8d69335574
+02a62b036da8980f536c12a5f163f4d0bba54c55
diff --git a/app/services/clusters/aws/authorize_role_service.rb b/app/services/clusters/aws/authorize_role_service.rb
index 6eafce0597e..fb620f77b9f 100644
--- a/app/services/clusters/aws/authorize_role_service.rb
+++ b/app/services/clusters/aws/authorize_role_service.rb
@@ -23,7 +23,9 @@ module Clusters
         @role = create_or_update_role!
 
         Response.new(:ok, credentials)
-      rescue *ERRORS
+      rescue *ERRORS => e
+        Gitlab::ErrorTracking.track_exception(e)
+
         Response.new(:unprocessable_entity, {})
       end
 
diff --git a/app/views/admin/requests_profiles/index.html.haml b/app/views/admin/requests_profiles/index.html.haml
index 6e1ac452d52..6c75dfe9733 100644
--- a/app/views/admin/requests_profiles/index.html.haml
+++ b/app/views/admin/requests_profiles/index.html.haml
@@ -11,7 +11,7 @@
 - if @profiles.present?
   .gl-mt-3
     - @profiles.each do |path, profiles|
-      .card.card-small
+      .card
         .card-header
           %code= path
         %ul.content-list
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index a21dcabb485..0f38d0e3b39 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -1,5 +1,5 @@
 - if @issues.to_a.any?
-  .card.card-small.card-without-border
+  .card.card-without-border
     %ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position'), data: { group_full_path: @group&.full_path } }
       = render partial: 'projects/issues/issue', collection: @issues
   = paginate @issues, theme: "gitlab"
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index 700ec4b606f..d280df8b370 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -1,5 +1,5 @@
 - if @merge_requests.to_a.any?
-  .card.card-small.card-without-border
+  .card.card-without-border
     %ul.content-list.mr-list.issuable-list
       = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests
 
diff --git a/changelogs/unreleased/237145-bs4-card-small.yml b/changelogs/unreleased/237145-bs4-card-small.yml
new file mode 100644
index 00000000000..839e2b1c518
--- /dev/null
+++ b/changelogs/unreleased/237145-bs4-card-small.yml
@@ -0,0 +1,5 @@
+---
+title: Remove a card-small class from HAML files
+merge_request: 39550
+author: Takuya Noguchi
+type: other
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index 2fdfca00f08..e7eab5a291e 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -48,24 +48,25 @@ You need Owner [permissions](../user/permissions.md) to view the group Audit Eve
 To view a group's audit events, navigate to **Group > Settings > Audit Events**.
 From there, you can see the following actions:
 
-- Group name or path changed
-- Group repository size limit changed
-- Group created or deleted
-- Group changed visibility
-- User was added to group and with which [permissions](../user/permissions.md)
-- User sign-in via [Group SAML](../user/group/saml_sso/index.md)
-- Permissions changes of a user assigned to a group
-- Removed user from group
-- Project repository imported into group
+- Group name or path changed.
+- Group repository size limit changed.
+- Group created or deleted.
+- Group changed visibility.
+- User was added to group and with which [permissions](../user/permissions.md).
+- User sign-in via [Group SAML](../user/group/saml_sso/index.md).
+- Permissions changes of a user assigned to a group.
+- Removed user from group.
+- Project repository imported into group.
 - [Project shared with group](../user/project/members/share_project_with_groups.md)
-  and with which [permissions](../user/permissions.md)
-- Removal of a previously shared group with a project
-- LFS enabled or disabled
-- Shared runners minutes limit changed
-- Membership lock enabled or disabled
-- Request access enabled or disabled
-- 2FA enforcement or grace period changed
-- Roles allowed to create project changed
+  and with which [permissions](../user/permissions.md).
+- Removal of a previously shared group with a project.
+- LFS enabled or disabled.
+- Shared runners minutes limit changed.
+- Membership lock enabled or disabled.
+- Request access enabled or disabled.
+- 2FA enforcement or grace period changed.
+- Roles allowed to create project changed.
+- Group CI/CD variable added, removed, or protected status changed. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30857) in GitLab 13.3.
 
 Group events can also be accessed via the [Group Audit Events API](../api/audit_events.md#group-audit-events-starter)
 
diff --git a/doc/ci/junit_test_reports.md b/doc/ci/junit_test_reports.md
index ca2d8dcc373..8bc55a6e4f3 100644
--- a/doc/ci/junit_test_reports.md
+++ b/doc/ci/junit_test_reports.md
@@ -66,10 +66,6 @@ execution time and the error output.
 
 ## How to set it up
 
-NOTE: **Note:**
-For a list of supported languages on JUnit tests, check the
-[Wikipedia article](https://en.wikipedia.org/wiki/JUnit#Ports).
-
 To enable the JUnit reports in merge requests, you need to add
 [`artifacts:reports:junit`](pipelines/job_artifacts.md#artifactsreportsjunit)
 in `.gitlab-ci.yml`, and specify the path(s) of the generated test reports.
@@ -80,9 +76,11 @@ collects the JUnit test report from each job. After each job is executed, the
 XML reports are stored in GitLab as artifacts and their results are shown in the
 merge request widget.
 
+To make the JUnit output files browsable, include them with the
+[`artifacts:paths`](yaml/README.md#artifactspaths) keyword as well, as shown in the [Ruby example](#ruby-example).
+
 NOTE: **Note:**
-If you also want the ability to browse JUnit output files, include the
-[`artifacts:paths`](yaml/README.md#artifactspaths) keyword. An example of this is shown in the Ruby example below.
+You cannot have multiple tests with the same name and class in your JUnit report.
 
 ### Ruby example
 
diff --git a/spec/services/clusters/aws/authorize_role_service_spec.rb b/spec/services/clusters/aws/authorize_role_service_spec.rb
index 530268340b7..3d12400a47b 100644
--- a/spec/services/clusters/aws/authorize_role_service_spec.rb
+++ b/spec/services/clusters/aws/authorize_role_service_spec.rb
@@ -53,6 +53,12 @@ RSpec.describe Clusters::Aws::AuthorizeRoleService do
         expect(subject.status).to eq(:unprocessable_entity)
         expect(subject.body).to eq({})
       end
+
+      it 'logs the error' do
+        expect(::Gitlab::ErrorTracking).to receive(:track_exception)
+
+        subject
+      end
     end
 
     context 'cannot create role' do