diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-20 03:37:44 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-20 03:37:44 +0300 |
| commit | d170133bded904603833f1b9e2727def3805962d (patch) | |
| tree | a1c1e1f9973b43a5ff2482d4e1b91b219c5ac3af /app/views/shared/_new_commit_form.html.haml | |
| parent | bfb635a4afea60751a44e6454f9c36850b5342c9 (diff) | |
Refactor changing files in web UI
Diffstat (limited to 'app/views/shared/_new_commit_form.html.haml')
| -rw-r--r-- | app/views/shared/_new_commit_form.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml index 3ac5e15d1c4..0b37fe3013b 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -1,11 +1,11 @@ = render 'shared/commit_message_container', placeholder: placeholder - if @project.empty_repo? - = hidden_field_tag 'target_branch', @ref + = hidden_field_tag 'branch_name', @ref - else - if can?(current_user, :push_code, @project) .form-group.branch - = label_tag 'target_branch', 'Target branch', class: 'control-label' + = label_tag 'branch_name', 'Target branch', class: 'control-label' .col-sm-10 = render 'shared/branch_switcher' @@ -16,7 +16,7 @@ = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}" Start a <strong>new merge request</strong> with these changes - else - = hidden_field_tag 'target_branch', @target_branch || tree_edit_branch + = hidden_field_tag 'branch_name', @branch_name || tree_edit_branch = hidden_field_tag 'create_merge_request', 1 = hidden_field_tag 'original_branch', @ref, class: 'js-original-branch' |