diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
| commit | 95f0440a7823a927ebba1557b091c12255e49ac4 (patch) | |
| tree | fa6d130f2baff18e7a70d74dafe79e20da35babe /app/views/projects/blob/new.html.haml | |
| parent | 4a5b77188ec7525d1c3a1ee925c8791f841b040c (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-95f0440a7823a927ebba1557b091c12255e49ac4.tar.gz | |
Merge branch 'master' into rs-redactor-filter
Diffstat (limited to 'app/views/projects/blob/new.html.haml')
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 1950586b112..7975137c37f 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -2,12 +2,7 @@ = render "header_title" .gray-content-block.top-block - Create a new file or - = link_to 'upload', '#modal-upload-blob', - { class: 'upload-link', 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal'} - an existing one - -= render 'projects/blob/upload', title: 'Upload', placeholder: 'Upload new file', button_title: 'Upload file', form_path: namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post + Create a new file .file-editor = form_tag(namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'form-horizontal form-new-file js-requires-input') do @@ -20,7 +15,7 @@ = label_tag 'branch', class: 'control-label' do Branch .col-sm-10 - = text_field_tag 'new_branch', @ref, class: "form-control" + = text_field_tag 'new_branch', @ref, class: "form-control js-quick-submit" = hidden_field_tag 'content', '', id: 'file-content' = render 'projects/commit_button', ref: @ref, |