diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-09 13:34:02 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-13 10:20:45 +0300 |
| commit | c7b425a3e50a3b348c17e8df2d44e8019d6afe3c (patch) | |
| tree | ea1d350cdaa90b3b8c3ed729fb396dded41f397d /app/services/merge_requests/refresh_service.rb | |
| parent | 7524406189939a1e872251f6aac4bcb5038cad1f (diff) | |
Mark as WIP based on MR commits only
Diffstat (limited to 'app/services/merge_requests/refresh_service.rb')
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index b4bfb0e5e8c..581d18032e6 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -144,7 +144,11 @@ module MergeRequests return unless @commits.present? merge_requests_for_source_branch.each do |merge_request| - wip_commit = @commits.detect(&:work_in_progress?) + commit_shas = merge_request.commits_sha + + wip_commit = @commits.detect do |commit| + commit.work_in_progress? && commit_shas.include?(commit.sha) + end if wip_commit && !merge_request.work_in_progress? merge_request.update(title: merge_request.wip_title) |