diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-08 18:50:02 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-08 18:50:02 +0100 |
| commit | 7234610010d767232159cdc90b8716ca5b0745a6 (patch) | |
| tree | ad7a24616f477219c07ff2348aeae7d8c4b21d2a /app/views/shared | |
| parent | 14165e59726b0813af90f785037d96d0973adf6d (diff) | |
| parent | 3c80a543153f8f686ec99d2d04b181b2d2c8a665 (diff) | |
| download | gitlab-ce-7234610010d767232159cdc90b8716ca5b0745a6.tar.gz | |
Merge remote-tracking branch 'origin/ui/misc'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_new_commit_form.html.haml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml index 31b02ed93d0..55aa045fd59 100644 --- a/app/views/shared/_new_commit_form.html.haml +++ b/app/views/shared/_new_commit_form.html.haml @@ -6,12 +6,11 @@ .col-sm-10 = text_field_tag 'new_branch', @new_branch || @ref, required: true, class: "form-control js-new-branch" - .form-group.js-create-merge-request-form-group - .col-sm-offset-2.col-sm-10 - .checkbox - - nonce = SecureRandom.hex - = label_tag "create_merge_request-#{nonce}" do - = 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 this commit + .js-create-merge-request-container + .checkbox + - nonce = SecureRandom.hex + = label_tag "create_merge_request-#{nonce}" do + = 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 = hidden_field_tag 'original_branch', @ref, class: 'js-original-branch' |