diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-09 01:04:52 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 01:04:52 +0300 |
| commit | e6668f8e341e422cae752e3371631b50eeb696b2 (patch) | |
| tree | 428ff5903dbd995082a4e6874aacfbd131a02287 /app/views/shared/_new_commit_form.html.haml | |
| parent | 275e8e7309604831485a1f0179f98f41c06f5a8c (diff) | |
| parent | 0f89e6905db6fe821332013e8ddb2707079e0ba4 (diff) | |
Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
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 55aa045fd59..111219f2064 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -4,7 +4,7 @@ .form-group.branch = label_tag 'new_branch', 'Target branch', class: 'control-label' .col-sm-10 - = text_field_tag 'new_branch', @new_branch || @ref, required: true, class: "form-control js-new-branch" + = text_field_tag 'new_branch', @new_branch || tree_edit_branch, required: true, class: "form-control js-new-branch" .js-create-merge-request-container .checkbox |