From 5987ad256985ffd2b964b4c030babc4102325e2c Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 23 Jun 2016 17:25:14 -0500 Subject: Add sub nav to file view --- app/views/projects/blob/show.html.haml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 -- cgit v1.2.1 From f06220411996165cbe4be96d438aa268f5827ed2 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Thu, 23 Jun 2016 17:34:33 -0500 Subject: Update CHANGELOG --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 764df7cf55a..cf7f8eda43d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,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 + - Update mobile button icons to be more inline with typical UI paradigms +v 8.9.3 + - Add sub nav to file page view v 8.9.2 - Fix visibility of snippets when searching. -- cgit v1.2.1 From 2485c5ded880634b3e9b4e2c96564a3e4775ac16 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 28 Jun 2016 16:39:41 +0200 Subject: Fix changelog for 8.9.3 Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cf7f8eda43d..680b6841122 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,8 +42,10 @@ 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 +v 8.9.3 (unreleased) + - 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.3 - Add sub nav to file page view v 8.9.2 -- cgit v1.2.1 From 13d5d99e94fb43d3883973f76508da890ad907d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 29 Jun 2016 22:17:34 +0200 Subject: Move changelot item "Add sub nav to file page view" to 8.9.4 Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 680b6841122..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,11 +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 -v 8.9.3 (unreleased) - 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 - - Add sub nav to file page view v 8.9.2 - Fix visibility of snippets when searching. -- cgit v1.2.1