Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
52e833645363
Commit
aeb6e672
authored
Feb 01, 2018
by
Oswaldo Ferreira
Browse files
Reload MRs memoization after diffs creation
parent
456b31523866
Changes
3
Show whitespace changes
Inline
Side-by-side
app/services/merge_requests/refresh_service.rb
View file @
52e83364
...
...
@@ -90,6 +90,10 @@ def reload_merge_requests
merge_request
.
mark_as_unchecked
UpdateHeadPipelineForMergeRequestWorker
.
perform_async
(
merge_request
.
id
)
end
# Upcoming method calls need the refreshed version of
# @source_merge_requests diffs (for MergeRequest#commit_shas for instance).
merge_requests_for_source_branch
(
reload:
true
)
end
def
reset_merge_when_pipeline_succeeds
...
...
@@ -195,7 +199,8 @@ def filter_merge_requests(merge_requests)
merge_requests
.
uniq
.
select
(
&
:source_project
)
end
def
merge_requests_for_source_branch
def
merge_requests_for_source_branch
(
reload:
false
)
@source_merge_requests
=
nil
if
reload
@source_merge_requests
||=
merge_requests_for
(
@branch_name
)
end
...
...
changelogs/unreleased/osw-system-notes-for-commits-regression.yml
0 → 100644
View file @
52e83364
---
title
:
Reload MRs memoization after diffs creation
merge_request
:
author
:
type
:
fixed
spec/services/merge_requests/refresh_service_spec.rb
View file @
52e83364
...
...
@@ -74,6 +74,14 @@
expect
(
@fork_build_failed_todo
).
to
be_done
end
it
'reloads source branch MRs memoization'
do
refresh_service
.
execute
(
@oldrev
,
@newrev
,
'refs/heads/master'
)
expect
{
refresh_service
.
execute
(
@oldrev
,
@newrev
,
'refs/heads/master'
)
}.
to
change
{
refresh_service
.
instance_variable_get
(
"@source_merge_requests"
).
first
.
merge_request_diff
}
end
context
'when source branch ref does not exists'
do
before
do
DeleteBranchService
.
new
(
@project
,
@user
).
execute
(
@merge_request
.
source_branch
)
...
...
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