diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-03-06 13:44:59 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-06 13:44:59 +0300 |
| commit | de5aef3bbda9217e32fc91c24280f78869c9c9c1 (patch) | |
| tree | 1c2a7468e0b7f31134ee7b6e9f537b798fdf724e /app/services/files | |
| parent | c9e5ce8dbd25203484b43c48f0a55a5d7bf396e8 (diff) | |
Accept force option on commit via API
When `force` is set to `true` and `start_branch` is set, the
branch will be ovewritten with the new commit based on the
`HEAD` of the `start_branch`.
This commit includes changes to update the `gitaly-proto` gem.
Diffstat (limited to 'app/services/files')
| -rw-r--r-- | app/services/files/multi_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/files/multi_service.rb b/app/services/files/multi_service.rb index 927634c2159..c1bc26c330a 100644 --- a/app/services/files/multi_service.rb +++ b/app/services/files/multi_service.rb @@ -46,7 +46,8 @@ module Files author_email: @author_email, author_name: @author_name, start_project: @start_project, - start_branch_name: @start_branch + start_branch_name: @start_branch, + force: force? ) rescue ArgumentError => e raise_error(e) |