Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
eafd8bf9
Commit
eafd8bf9
authored
Nov 19, 2021
by
Sam Kerr
Committed by
Kerri Miller
Nov 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct audit message text to mention committers instead of reviewers
parent
97c1d0d8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
5 deletions
+9
-5
doc/administration/audit_events.md
doc/administration/audit_events.md
+4
-0
doc/api/audit_events.md
doc/api/audit_events.md
+2
-2
ee/lib/ee/audit/project_changes_auditor.rb
ee/lib/ee/audit/project_changes_auditor.rb
+1
-1
ee/spec/features/projects/audit_events_spec.rb
ee/spec/features/projects/audit_events_spec.rb
+1
-1
ee/spec/lib/ee/audit/project_changes_auditor_spec.rb
ee/spec/lib/ee/audit/project_changes_auditor_spec.rb
+1
-1
No files found.
doc/administration/audit_events.md
View file @
eafd8bf9
...
...
@@ -128,6 +128,10 @@ From there, you can see the following actions:
-
Release was updated
-
Release milestone associations changed
-
Permission to approve merge requests by committers was updated (
[
introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/7531
)
in GitLab 12.9)
-
Permission to approve merge requests by committers was updated.
-
[
Introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/7531
)
in GitLab 12.9.
-
Message for event
[
changed
](
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72623/diffs
)
in GitLab 14.6.
-
Permission to approve merge requests by authors was updated (
[
introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/7531
)
in GitLab 12.9)
-
Number of required approvals was updated (
[
introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/7531
)
in GitLab 12.9)
-
Added or removed users and groups from project approval groups (
[
introduced
](
https://gitlab.com/gitlab-org/gitlab/-/issues/213603
)
in GitLab 13.2)
...
...
doc/api/audit_events.md
View file @
eafd8bf9
...
...
@@ -277,7 +277,7 @@ Example response:
"entity_id"
:
7
,
"entity_type"
:
"Project"
,
"details"
:
{
"change"
:
"prevent merge request approval from
review
ers"
,
"change"
:
"prevent merge request approval from
committ
ers"
,
"from"
:
""
,
"to"
:
"true"
,
"author_name"
:
"Administrator"
,
...
...
@@ -336,7 +336,7 @@ Example response:
"entity_id"
:
7
,
"entity_type"
:
"Project"
,
"details"
:
{
"change"
:
"prevent merge request approval from
review
ers"
,
"change"
:
"prevent merge request approval from
committ
ers"
,
"from"
:
""
,
"to"
:
"true"
,
"author_name"
:
"Administrator"
,
...
...
ee/lib/ee/audit/project_changes_auditor.rb
View file @
eafd8bf9
...
...
@@ -12,7 +12,7 @@ module EE
audit_changes
(
:packages_enabled
,
as:
'packages_enabled'
,
model:
model
)
audit_changes
(
:merge_requests_author_approval
,
as:
'prevent merge request approval from authors'
,
model:
model
)
audit_changes
(
:merge_requests_disable_committers_approval
,
as:
'prevent merge request approval from
review
ers'
,
model:
model
)
audit_changes
(
:merge_requests_disable_committers_approval
,
as:
'prevent merge request approval from
committ
ers'
,
model:
model
)
audit_changes
(
:reset_approvals_on_push
,
as:
'require new approvals when new commits are added to an MR'
,
model:
model
)
audit_changes
(
:disable_overriding_approvers_per_merge_request
,
as:
'prevent users from modifying MR approval rules in merge requests'
,
model:
model
)
audit_changes
(
:require_password_to_approve
,
as:
'require user password for approvals'
,
model:
model
)
...
...
ee/spec/features/projects/audit_events_spec.rb
View file @
eafd8bf9
...
...
@@ -168,7 +168,7 @@ RSpec.describe 'Projects > Audit Events', :js do
page
.
within
(
'.audit-log-table'
)
do
expect
(
page
).
to
have_content
(
project
.
owner
.
name
)
expect
(
page
).
to
have_content
(
'Changed prevent merge request approval from authors'
)
expect
(
page
).
to
have_content
(
'Changed prevent merge request approval from
review
ers'
)
expect
(
page
).
to
have_content
(
'Changed prevent merge request approval from
committ
ers'
)
expect
(
page
).
to
have_content
(
project
.
name
)
end
end
...
...
ee/spec/lib/ee/audit/project_changes_auditor_spec.rb
View file @
eafd8bf9
...
...
@@ -160,7 +160,7 @@ RSpec.describe EE::Audit::ProjectChangesAuditor do
aggregate_failures
do
expect
{
foo_instance
.
execute
}.
to
change
{
AuditEvent
.
count
}.
by
(
1
)
expect
(
AuditEvent
.
last
.
details
).
to
include
(
change:
'prevent merge request approval from
review
ers'
,
change:
'prevent merge request approval from
committ
ers'
,
from:
true
,
to:
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment