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-11-17 20:53:56 +0300
committerDouwe Maan <douwe@gitlab.com>2015-11-17 20:53:56 +0300
commite945ec02804bb28dbd228d8002a159c8da0fcc38 (patch)
tree72600162a61e7990d6c62ce5af90f5e649cc1e86 /app/views/shared/_new_commit_form.html.haml
parent0b540a0fadf172277639910023fcf8b713ad35aa (diff)
Add "Start a new merge request" option to every commit form
Diffstat (limited to 'app/views/shared/_new_commit_form.html.haml')
-rw-r--r--app/views/shared/_new_commit_form.html.haml18
1 files changed, 18 insertions, 0 deletions
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml
new file mode 100644
index 00000000000..8636341c60d
--- /dev/null
+++ b/app/views/shared/_new_commit_form.html.haml
@@ -0,0 +1,18 @@
+= render 'shared/commit_message_container', placeholder: placeholder
+
+- unless @project.empty_repo?
+ .form-group.branch
+ = label_tag 'branch', class: 'control-label' do
+ Branch
+ .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
+
+ = hidden_field_tag 'original_branch', @ref, class: 'js-original-branch'