Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
c00972b9d1
commit
681ca59b6f
|
@ -1 +1 @@
|
|||
c6e8f5d546e404086299802237030b8d69335574
|
||||
02a62b036da8980f536c12a5f163f4d0bba54c55
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove a card-small class from HAML files
|
||||
merge_request: 39550
|
||||
author: Takuya Noguchi
|
||||
type: other
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue