diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-07-18 13:47:35 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-18 13:47:35 +0300 |
| commit | 3069cb25451cf9aad4840551b7286fee1c5aebc8 (patch) | |
| tree | 3f7daffc2fd7adfbebe14a625293e2f005785140 /lib/gitlab/git | |
| parent | 69c113fc8cff7c7646bf252d32b1956b255eaf37 (diff) | |
| parent | d4cc92db09a0c765556882943b7508075a0ab0e2 (diff) | |
Merge branch 'webide-commit-use-correct-parent' into 'master'
Use correct parent when committing in WebIDE
See merge request gitlab-org/gitlab-ce!29598
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index a7d9ba51277..6e8aa5d578e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -873,13 +873,13 @@ module Gitlab def multi_action( user, branch_name:, message:, actions:, author_email: nil, author_name: nil, - start_branch_name: nil, start_repository: self, + start_branch_name: nil, start_sha: nil, start_repository: self, force: false) wrapped_gitaly_errors do gitaly_operation_client.user_commit_files(user, branch_name, message, actions, author_email, author_name, - start_branch_name, start_repository, force) + start_branch_name, start_repository, force, start_sha) end end # rubocop:enable Metrics/ParameterLists |