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 /app/models/repository.rb | |
| parent | ac9229a31be8e672efdcc63b702a2039ae66ad46 (diff) | |
| download | gitlab-ce-ba327e69ec4b2214f12f577cd86a37c65ea2f3e9.tar.gz | |
Move resolving code to ResolveService
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e56bac509a4..01b02ccc0dc 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -869,6 +869,14 @@ class Repository end end + def resolve_conflicts(user, branch, params) + commit_with_hooks(user, branch) do + committer = user_to_committer(user) + + Rugged::Commit.create(rugged, params.merge(author: committer, committer: committer)) + end + end + def check_revert_content(commit, base_branch) source_sha = find_branch(base_branch).target.sha args = [commit.id, source_sha] |