diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 08:43:50 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-30 15:20:35 -0400 |
| commit | d3b282070ed0374b929be64169ace4115f946255 (patch) | |
| tree | 538e2ea8b78e57240a7e80cb469e1ebf4c94933a | |
| parent | 966eedd36720888f75207497e8ff7e708115c54d (diff) | |
| download | gitlab-ce-d3b282070ed0374b929be64169ace4115f946255.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
(cherry picked from commit 2efee5f6410f4e8e40e9b0339393de80f4affdde)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 65e7eff5c9d..1046adfd53e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.9.4 - Fix privilege escalation issue with OAuth external users. - Ensure references to private repos aren't shown to logged-out users. - Fixed search field blur not removing focus. !4704 + - Resolve "Sub nav isn't showing on file view". !4890 v 8.9.3 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 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 |