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
025daa4f
Commit
025daa4f
authored
May 26, 2021
by
Marc Shaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create the pipelines after we are done with the MR to avoid some locking
parent
744edfc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+2
-1
No files found.
app/services/merge_requests/refresh_service.rb
View file @
025daa4f
...
@@ -27,7 +27,6 @@ module MergeRequests
...
@@ -27,7 +27,6 @@ module MergeRequests
merge_requests_for_source_branch
.
each
do
|
mr
|
merge_requests_for_source_branch
.
each
do
|
mr
|
outdate_suggestions
(
mr
)
outdate_suggestions
(
mr
)
refresh_pipelines_on_merge_requests
(
mr
)
abort_auto_merges
(
mr
)
abort_auto_merges
(
mr
)
mark_pending_todos_done
(
mr
)
mark_pending_todos_done
(
mr
)
end
end
...
@@ -44,6 +43,8 @@ module MergeRequests
...
@@ -44,6 +43,8 @@ module MergeRequests
notify_about_push
(
mr
)
notify_about_push
(
mr
)
mark_mr_as_draft_from_commits
(
mr
)
mark_mr_as_draft_from_commits
(
mr
)
execute_mr_web_hooks
(
mr
)
execute_mr_web_hooks
(
mr
)
# Run at the end of the loop to avoid any potential contention on the MR object
refresh_pipelines_on_merge_requests
(
mr
)
merge_request_activity_counter
.
track_mr_including_ci_config
(
user:
mr
.
author
,
merge_request:
mr
)
merge_request_activity_counter
.
track_mr_including_ci_config
(
user:
mr
.
author
,
merge_request:
mr
)
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