diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-19 15:59:02 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-09-19 15:59:02 +0200 |
| commit | 6979324778eef81aaacd685131083975b063edfe (patch) | |
| tree | 0d50af8dabdd63f5bac005f65f0568adfee8f450 | |
| parent | c0bea016d4f415a89154af93bddc49a7b9067ea9 (diff) | |
| download | gitlab-ce-gitaly-prepare-cherry-pick-revert.tar.gz | |
Use keyword argumentsgitaly-prepare-cherry-pick-revert
| -rw-r--r-- | app/models/repository.rb | 10 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 2117e932ede..804e8979f19 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -860,7 +860,10 @@ class Repository with_cache_hooks do raw_repository.revert( - user, commit.raw, branch_name, message, + user: user, + commit: commit.raw, + branch_name: branch_name, + message: message, start_branch_name: start_branch_name, start_repository: start_project.repository.raw_repository ) @@ -873,7 +876,10 @@ class Repository with_cache_hooks do raw_repository.cherry_pick( - user, commit.raw, branch_name, message, + user: user, + commit: commit.raw, + branch_name: branch_name, + message: message, start_branch_name: start_branch_name, start_repository: start_project.repository.raw_repository ) diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 5fe9a268ab4..e2d68c667da 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -685,7 +685,7 @@ module Gitlab nil end - def revert(user, commit, branch_name, message, start_branch_name:, start_repository:) + def revert(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:) OperationService.new(user, self).with_branch( branch_name, start_branch_name: start_branch_name, @@ -720,7 +720,7 @@ module Gitlab tree_id end - def cherry_pick(user, commit, branch_name, message, start_branch_name:, start_repository:) + def cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:) OperationService.new(user, self).with_branch( branch_name, start_branch_name: start_branch_name, |