diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-20 22:42:07 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-20 22:42:07 +0100 |
| commit | 8a829c9738f2d4275b9233a722ffaa2cbb145553 (patch) | |
| tree | b62b75f14e1603e2a7cd45a4e82dc4886d882467 /app/views/projects | |
| parent | 12da27090f0a8ff4b05023a5216738413dcbe110 (diff) | |
| parent | 714f95b2ff68c02eeee9151c9b456bb2afe7eaff (diff) | |
| download | gitlab-ce-8a829c9738f2d4275b9233a722ffaa2cbb145553.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading
Diffstat (limited to 'app/views/projects')
4 files changed, 1 insertions, 5 deletions
diff --git a/app/views/projects/artifacts/_tree_directory.html.haml b/app/views/projects/artifacts/_tree_directory.html.haml index e4b7979949c..def493c56f5 100644 --- a/app/views/projects/artifacts/_tree_directory.html.haml +++ b/app/views/projects/artifacts/_tree_directory.html.haml @@ -6,4 +6,3 @@ %span.str-truncated = link_to directory.name, path_to_directory %td - %td diff --git a/app/views/projects/artifacts/_tree_file.html.haml b/app/views/projects/artifacts/_tree_file.html.haml index 3dfc09cc495..36fb4c998c9 100644 --- a/app/views/projects/artifacts/_tree_file.html.haml +++ b/app/views/projects/artifacts/_tree_file.html.haml @@ -7,5 +7,3 @@ = link_to file.name, path_to_file %td = number_to_human_size(file.metadata[:size], precision: 2) - %td - = number_to_human_size(file.metadata[:zipped], precision: 2) diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index b70c776a2b2..d3c969cc035 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -15,7 +15,6 @@ %tr %th Name %th Size - %th Compressed to = render partial: 'tree_directory', collection: @entry.directories(parent: true), as: :directory = render partial: 'tree_file', collection: @entry.files, as: :file diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index 40a2a61d8a1..905f6bbbd48 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -10,7 +10,7 @@ = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do = @project.path %li.file-finder - %input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path'} + %input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path', autocomplete: 'off'} %div.tree-content-holder .table-holder |