diff options
| author | liyakun <liyakun127@gmail.com> | 2015-09-10 16:18:40 +0200 |
|---|---|---|
| committer | liyakun <liyakun127@gmail.com> | 2015-09-15 02:12:56 +0200 |
| commit | e2ece2bc350bf881e9716e51c01a59eecac65fc9 (patch) | |
| tree | 422d043e1cd6bc09c62fd726958384c320c483d8 /app/views/projects/blob/_actions.html.haml | |
| parent | 7abb744eb961d95ef9f34e8b64c47084d3f620b6 (diff) | |
| download | gitlab-ce-e2ece2bc350bf881e9716e51c01a59eecac65fc9.tar.gz | |
Add "Replace" and "Upload" features
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
Diffstat (limited to 'app/views/projects/blob/_actions.html.haml')
| -rw-r--r-- | app/views/projects/blob/_actions.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/blob/_actions.html.haml b/app/views/projects/blob/_actions.html.haml index 13f8271b979..5b61846fe6d 100644 --- a/app/views/projects/blob/_actions.html.haml +++ b/app/views/projects/blob/_actions.html.haml @@ -17,6 +17,6 @@ tree_join(@commit.sha, @path)), class: 'btn btn-sm' - if allowed_tree_edit? - = button_tag class: 'remove-blob btn btn-sm btn-remove', - 'data-toggle' => 'modal', 'data-target' => '#modal-remove-blob' do - Remove + .btn-group{:role => "group"} + %button.btn.btn-default{class: 'btn-primary', href: '#modal-replace-blob', 'data-target' => '#modal-replace-blob', 'data-toggle' => 'modal'} Replace + %button.btn.btn-default{class: 'btn-remove', href: '#modal-remove-blob', 'data-target' => '#modal-remove-blob', 'data-toggle' => 'modal'} Remove |