From c12e4de50cab653a61e15ef4eec915ae093c32d2 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 2 Dec 2015 14:57:38 +0100
Subject: [PATCH] Move "Start new merge request" checkbox closer to New branch
 field

---
 app/assets/javascripts/new_commit_form.js.coffee |  6 +++---
 app/views/shared/_new_commit_form.html.haml      | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/new_commit_form.js.coffee b/app/assets/javascripts/new_commit_form.js.coffee
index 2e561dea3e..3c7b776155 100644
--- a/app/assets/javascripts/new_commit_form.js.coffee
+++ b/app/assets/javascripts/new_commit_form.js.coffee
@@ -3,7 +3,7 @@ class @NewCommitForm
     @newBranch = form.find('.js-new-branch')
     @originalBranch = form.find('.js-original-branch')
     @createMergeRequest = form.find('.js-create-merge-request')
-    @createMergeRequestFormGroup = form.find('.js-create-merge-request-form-group')
+    @createMergeRequestContainer = form.find('.js-create-merge-request-container')
 
     @renderDestination()
     @newBranch.keyup @renderDestination
@@ -12,10 +12,10 @@ class @NewCommitForm
     different = @newBranch.val() != @originalBranch.val()
 
     if different
-      @createMergeRequestFormGroup.show()
+      @createMergeRequestContainer.show()
       @createMergeRequest.prop('checked', true) unless @wasDifferent
     else
-      @createMergeRequestFormGroup.hide()
+      @createMergeRequestContainer.hide()
       @createMergeRequest.prop('checked', false)
 
     @wasDifferent = different
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml
index 8636341c60..2931fb0c2c 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'