diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-23 12:36:41 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-06 10:39:23 -0500 |
| commit | 7b533ef7f140450783485b01cdf0434b77a9f90e (patch) | |
| tree | 16c4bb003c74c02e858ef835602e87e5709b327d /app/services/merge_requests/conflicts/resolve_service.rb | |
| parent | d07e85e1033f8026f155c6171cb3ebcd6b93d9ed (diff) | |
| download | gitlab-ce-7b533ef7f140450783485b01cdf0434b77a9f90e.tar.gz | |
Change from double click to single click to open dropdownch-test-2
Diffstat (limited to 'app/services/merge_requests/conflicts/resolve_service.rb')
| -rw-r--r-- | app/services/merge_requests/conflicts/resolve_service.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/services/merge_requests/conflicts/resolve_service.rb b/app/services/merge_requests/conflicts/resolve_service.rb index d74a82effd6..c2c335b8461 100644 --- a/app/services/merge_requests/conflicts/resolve_service.rb +++ b/app/services/merge_requests/conflicts/resolve_service.rb @@ -37,11 +37,13 @@ module MergeRequests private def write_resolved_file_to_index(merge_index, rugged, file, params) - new_file = if params[:sections] - file.resolve_lines(params[:sections]).map(&:text).join("\n") - elsif params[:content] - file.resolve_content(params[:content]) - end + if params[:sections] + new_file = file.resolve_lines(params[:sections]).map(&:text).join("\n") + + new_file << "\n" if file.our_blob.data.ends_with?("\n") + elsif params[:content] + new_file = file.resolve_content(params[:content]) + end our_path = file.our_path |