diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2016-12-22 09:21:40 +0300 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-03-13 18:36:11 +0300 |
| commit | e0fe2834ebe6d9678444c8a10b79ca093f944232 (patch) | |
| tree | a2d7c482f7271d8af7ba47e76c9d48a1d3e357f4 /app/views/shared/_new_commit_form.html.haml | |
| parent | 9ed3db915026c6e0cd266a1c276386e3e96d2151 (diff) | |
New file from interface on existing branch
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
Diffstat (limited to 'app/views/shared/_new_commit_form.html.haml')
| -rw-r--r-- | app/views/shared/_new_commit_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml index 0c8ac48bb58..3ac5e15d1c4 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -7,7 +7,7 @@ .form-group.branch = label_tag 'target_branch', 'Target branch', class: 'control-label' .col-sm-10 - = text_field_tag 'target_branch', @target_branch || tree_edit_branch, required: true, class: "form-control js-target-branch" + = render 'shared/branch_switcher' .js-create-merge-request-container .checkbox |