0ab6ca93aa
Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
31 lines
1.4 KiB
Text
31 lines
1.4 KiB
Text
#modal-upload-blob.modal
|
||
.modal-dialog
|
||
.modal-content
|
||
.modal-header
|
||
%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
|
||
.dropzone
|
||
.dropzone-previews.blob-upload-dropzone-previews
|
||
%p.dz-message.light
|
||
Attach a file by drag & drop or
|
||
= 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"
|
||
.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"
|
||
|
||
:coffeescript
|
||
disableButtonIfEmptyField $('.blob-file-upload-form-js').find('#commit_message'), '.btn-upload-file'
|
||
new BlobFileDropzone($('.blob-file-upload-form-js'), '#{method}')
|