diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 08:43:50 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 08:43:50 +0000 |
| commit | 2efee5f6410f4e8e40e9b0339393de80f4affdde (patch) | |
| tree | c58e02329ce491d24d50f160600d5e6c47750ede | |
| parent | b32a6add8fa602eb35648f3f4661df8b98d909cb (diff) | |
| parent | 13d5d99e94fb43d3883973f76508da890ad907d8 (diff) | |
| download | gitlab-ce-2efee5f6410f4e8e40e9b0339393de80f4affdde.tar.gz | |
Merge branch '19003-file-view-subnav' into 'master'
Resolve "Sub nav isn't showing on file view"
## What does this MR do?
Adds subnav to `Repository` > `File` view
## What are the relevant issue numbers?
Closes #19003
Part of #18844
## Screenshots (if relevant)
cc @dzaporozhets
See merge request !4890
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 764df7cf55a..ca7c3f29c72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.10.0 (unreleased) v 8.9.4 (unreleased) - Fixes middle click and double request when navigating through the file browser !4891 + - Add sub nav to file page view v 8.9.3 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 @@ -42,6 +43,9 @@ v 8.9.3 - Fix missing avatar on system notes. !4954 - Reduce overhead and optimize ProjectTeam#max_member_access performance. !4973 - Use update_columns to by_pass all the dirty code on active_record. !4985 + - Decreased min width of screen to 1280px for pinned sidebar + - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem + - Update mobile button icons to be more inline with typical UI paradigms v 8.9.2 - Fix visibility of snippets when searching. diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index ed670dae88d..8d77bdbe382 100644 --- a/app/views/projects/blob/show.html.haml +++ b/app/views/projects/blob/show.html.haml @@ -1,12 +1,15 @@ +- @no_container = true - page_title @blob.path, @ref += render "projects/commits/head" -= render 'projects/last_push' +%div{ class: (container_class) } + = render 'projects/last_push' -%div#tree-holder.tree-holder - = render 'blob', blob: @blob + %div#tree-holder.tree-holder + = render 'blob', blob: @blob -- if can_edit_blob?(@blob) - = render 'projects/blob/remove' + - if can_edit_blob?(@blob) + = render 'projects/blob/remove' - - title = "Replace #{@blob.name}" - = render 'projects/blob/upload', title: title, placeholder: title, button_title: 'Replace file', form_path: namespace_project_update_blob_path(@project.namespace, @project, @id), method: :put + - title = "Replace #{@blob.name}" + = render 'projects/blob/upload', title: title, placeholder: title, button_title: 'Replace file', form_path: namespace_project_update_blob_path(@project.namespace, @project, @id), method: :put |