diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-04 14:20:04 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:48 +0300 |
| commit | ba327e69ec4b2214f12f577cd86a37c65ea2f3e9 (patch) | |
| tree | 8b869b02caae808510156aa4936dfe1123b61db9 /lib/gitlab/conflict/file.rb | |
| parent | ac9229a31be8e672efdcc63b702a2039ae66ad46 (diff) | |
| download | gitlab-ce-ba327e69ec4b2214f12f577cd86a37c65ea2f3e9.tar.gz | |
Move resolving code to ResolveService
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 6284b0dd377..3560fae5b09 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -28,14 +28,6 @@ module Gitlab parent_file: self) end - def resolve!(resolution, index:, rugged:) - new_file = resolve_lines(resolution).map(&:text).join("\n") - - oid = rugged.write(new_file, :blob) - index.add(path: our_path, oid: oid, mode: our_mode) - index.conflict_remove(our_path) - end - def resolve_lines(resolution) section_id = nil |