diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-02-06 12:33:11 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 12:33:11 +0000 |
| commit | 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a (patch) | |
| tree | 47615a573f6dc932353f0f6695cd4fcd050b1201 /app/models/repository.rb | |
| parent | 5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (diff) | |
| download | gitlab-ce-2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a.tar.gz | |
Allow custom squash commit messages
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 9ae13fbaa80..bfd2608bed4 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1030,12 +1030,12 @@ class Repository remote_branch: merge_request.target_branch) end - def squash(user, merge_request) + def squash(user, merge_request, message) raw.squash(user, merge_request.id, branch: merge_request.target_branch, start_sha: merge_request.diff_start_sha, end_sha: merge_request.diff_head_sha, author: merge_request.author, - message: merge_request.title) + message: message) end def update_submodule(user, submodule, commit_sha, message:, branch:) |