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
fe5b93bc
Commit
fe5b93bc
authored
Dec 03, 2019
by
Kerri Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update approvers before resetting approvals
parent
17de0b74
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
ee/app/services/ee/merge_requests/refresh_service.rb
ee/app/services/ee/merge_requests/refresh_service.rb
+4
-7
No files found.
ee/app/services/ee/merge_requests/refresh_service.rb
View file @
fe5b93bc
...
...
@@ -9,9 +9,10 @@ module EE
override
:refresh_merge_requests!
def
refresh_merge_requests!
update_approvers
do
super
&&
reset_approvals_for_merge_requests
(
push
.
ref
,
push
.
newrev
)
end
update_approvers
reset_approvals_for_merge_requests
(
push
.
ref
,
push
.
newrev
)
super
end
# Note: Closed merge requests also need approvals reset.
...
...
@@ -38,14 +39,10 @@ module EE
end
def
update_approvers
results
=
yield
merge_requests_for_source_branch
.
each
do
|
merge_request
|
::
MergeRequests
::
SyncCodeOwnerApprovalRules
.
new
(
merge_request
).
execute
if
project
.
feature_available?
(
:code_owners
)
::
MergeRequests
::
SyncReportApproverApprovalRules
.
new
(
merge_request
).
execute
if
project
.
feature_available?
(
:report_approver_rules
)
end
results
end
end
end
...
...
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