Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-06-20 20:22:39 +0300
committerDouwe Maan <douwe@selenight.nl>2016-07-07 01:51:00 +0300
commit710c4886911682742d439b15c5a7add7ca0bd898 (patch)
tree36c238f097c9ccb8cf328f6918810e06cf131444 /app/services/merge_requests/refresh_service.rb
parent8d7dc26d39b65b3ef6e8ec80ed5995ae307c3d3c (diff)
Automatically update diff note positions when MR is pushed to
Diffstat (limited to 'app/services/merge_requests/refresh_service.rb')
-rw-r--r--app/services/merge_requests/refresh_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index de79c024428..21490ac77ea 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -60,7 +60,7 @@ module MergeRequests
merge_requests.each do |merge_request|
if merge_request.source_branch == @branch_name || force_push?
- merge_request.reload_code
+ merge_request.reload_diff
merge_request.mark_as_unchecked
else
mr_commit_ids = merge_request.commits.map(&:id)
@@ -68,7 +68,7 @@ module MergeRequests
matches = mr_commit_ids & push_commit_ids
if matches.any?
- merge_request.reload_code
+ merge_request.reload_diff
merge_request.mark_as_unchecked
else
merge_request.mark_as_unchecked