diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 20:53:56 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 20:53:56 +0300 |
| commit | e945ec02804bb28dbd228d8002a159c8da0fcc38 (patch) | |
| tree | 72600162a61e7990d6c62ce5af90f5e649cc1e86 /app/views/projects/blob/_upload.html.haml | |
| parent | 0b540a0fadf172277639910023fcf8b713ad35aa (diff) | |
Add "Start a new merge request" option to every commit form
Diffstat (limited to 'app/views/projects/blob/_upload.html.haml')
| -rw-r--r-- | app/views/projects/blob/_upload.html.haml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index a1c54e731f0..3bb61f0c944 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -5,7 +5,7 @@ %a.close{href: "#", "data-dismiss" => "modal"} × %h3.page-title #{title} .modal-body - = form_tag form_path, method: method, class: 'blob-file-upload-form-js form-horizontal' do + = form_tag form_path, method: method, class: 'js-upload-blob-form form-horizontal' do .dropzone .dropzone-previews.blob-upload-dropzone-previews %p.dz-message.light @@ -13,19 +13,15 @@ = link_to 'click to upload', '#', class: "markdown-selector" %br .dropzone-alerts{class: "alert alert-danger data", style: "display:none"} - = render 'shared/commit_message_container', params: params, - 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', @ref, class: "form-control" + + = render 'shared/new_commit_form', placeholder: placeholder + .form-group .col-sm-offset-2.col-sm-10 = button_tag button_title, class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all' = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" :javascript - disableButtonIfEmptyField($('.blob-file-upload-form-js').find('#commit_message'), '.btn-upload-file'); - new BlobFileDropzone($('.blob-file-upload-form-js'), '#{method}'); + disableButtonIfEmptyField($('.js-upload-blob-form').find('.js-commit-message'), '.btn-upload-file'); + new BlobFileDropzone($('.js-upload-blob-form'), '#{method}'); + new NewCommitForm($('.js-upload-blob-form')) |