home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19003-file-view-subnav' into 'master'

Browse Source 
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)
![Screen_Shot_2016-06-23_at_5.33.05_PM](/uploads/aa6993b2376dbe454af87d852aa74f5e/Screen_Shot_2016-06-23_at_5.33.05_PM.png)

cc @dzaporozhets 

See merge request !4890
This commit is contained in:
Dmitriy Zaporozhets
2016-06-30 08:43:50 +00:00
parent b32a6add8f 13d5d99e94
commit 2efee5f641
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+4
View File
@@ -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.
app/views/projects/blob/show.html.haml
+10 -7
View File
@@ -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