diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
| commit | e7d530a624fbb8854047c3983eaa0972a19f36c8 (patch) | |
| tree | 92f77913a359ccf4078cf010add02d8b8f765490 /lib/api/files.rb | |
| parent | dce77b1d6d5e2b82441a685d385ee809c6b35b76 (diff) | |
| parent | 54fca95160389fe7993df5d82635b83804833fee (diff) | |
| download | gitlab-ce-e7d530a624fbb8854047c3983eaa0972a19f36c8.tar.gz | |
Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change
Closes #23439
See merge request !7237
Diffstat (limited to 'lib/api/files.rb')
| -rw-r--r-- | lib/api/files.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 2e79e22e649..c58472de578 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -5,7 +5,7 @@ module API def commit_params(attrs) { file_path: attrs[:file_path], - source_branch: attrs[:branch_name], + start_branch: attrs[:branch_name], target_branch: attrs[:branch_name], commit_message: attrs[:commit_message], file_content: attrs[:content], |