diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-09-16 22:45:22 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-07 04:22:55 -0700 |
| commit | 0ab6ca93aadaf08f65f36e7fbdb5b837bac6e160 (patch) | |
| tree | b20c01f8a37413e401873e5fd1be5e07865b93ac /app/views/projects/blob/new.html.haml | |
| parent | 0611a18964a998b6edc81ef9b469f9f70430e542 (diff) | |
| download | gitlab-ce-0ab6ca93aadaf08f65f36e7fbdb5b837bac6e160.tar.gz | |
Add directory feature button
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
Diffstat (limited to 'app/views/projects/blob/new.html.haml')
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 1950586b112..d7987e24ef3 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 |