Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 16:57:38 +0300
committerDouwe Maan <douwe@gitlab.com>2015-12-02 16:57:38 +0300
commitc12e4de50cab653a61e15ef4eec915ae093c32d2 (patch)
tree984ea80886daf3cd2bab72bc3fdd5d06729e0545 /app/views/shared/_new_commit_form.html.haml
parent03277af65d111be7832fab060b3de8c42f885847 (diff)
Move "Start new merge request" checkbox closer to New branch field
Diffstat (limited to 'app/views/shared/_new_commit_form.html.haml')
-rw-r--r--app/views/shared/_new_commit_form.html.haml13
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 8636341c60d..2931fb0c2ce 100644
--- a/app/views/shared/_new_commit_form.html.haml
+++ b/app/views/shared/_new_commit_form.html.haml
@@ -7,12 +7,11 @@
.col-sm-10
= text_field_tag 'new_branch', @new_branch || @ref, 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'