diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-01-23 12:42:26 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-01-25 11:30:44 -0200 |
commit | 1b93b3b640c6dd6377bdddb8beb77f7c3d0da3fc (patch) | |
tree | 48826d924b61eb2cae2e3f951ce13cac9efa36d6 /app/services/suggestions | |
parent | dc6091876d1c70e25f2153d24dbe04f8b4b875a9 (diff) | |
download | gitlab-ce-1b93b3b640c6dd6377bdddb8beb77f7c3d0da3fc.tar.gz |
Adjusts suggestions unable to be applied
1. Presents the system error message when available,
when applying suggestions
2. Adjusts target branch updates affecting MRs pointing
to it when there are previously created suggestions in
the MR. We just need to compare the HEAD shas from
position and MR source branch.
Diffstat (limited to 'app/services/suggestions')
-rw-r--r-- | app/services/suggestions/apply_service.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/services/suggestions/apply_service.rb b/app/services/suggestions/apply_service.rb index cc47b46b527..1f720fc835f 100644 --- a/app/services/suggestions/apply_service.rb +++ b/app/services/suggestions/apply_service.rb @@ -11,7 +11,7 @@ module Suggestions return error('Suggestion is not appliable') end - unless latest_diff_refs?(suggestion) + unless latest_source_head?(suggestion) return error('The file has been changed') end @@ -29,12 +29,13 @@ module Suggestions private - # Checks whether the latest diff refs for the branch matches with - # the position refs we're using to update the file content. Since - # the persisted refs are updated async (for MergeRequest), - # it's more consistent to fetch this data directly from the repository. - def latest_diff_refs?(suggestion) - suggestion.position.diff_refs == suggestion.noteable.repository_diff_refs + # Checks whether the latest source branch HEAD matches with + # the position HEAD we're using to update the file content. Since + # the persisted HEAD is updated async (for MergeRequest), + # it's more consistent to fetch this data directly from the + # repository. + def latest_source_head?(suggestion) + suggestion.position.head_sha == suggestion.noteable.source_branch_sha end def file_update_params(suggestion) |