From 3646eb165c1ed0bb64ec6259ea285f00e46180f0 Mon Sep 17 00:00:00 2001
From: Serg <redetection@gmail.com>
Date: Wed, 6 Jul 2016 08:01:32 +0000
Subject: Allow everyone to sort tags, not only those who has access

---
 CHANGELOG                               |  1 +
 app/views/projects/tags/index.html.haml | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1350317ad64..42a5e50be50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 8.10.0 (unreleased)
   - Make images fit to the size of the viewport !4810
   - Fix check for New Branch button on Issue page !4630 (winniehell)
   - Fix MR-auto-close text added to description. !4836
+  - Fix issue, preventing users w/o push access to sort tags !5105 (redetection)
   - Add Spring EmojiOne updates.
   - Fix pagination when sorting by columns with lots of ties (like priority)
   - Updated project header design
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index c375bb6dd1b..368231e73fe 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -7,22 +7,22 @@
     .nav-text
       Tags give the ability to mark specific points in history as being important
 
-    - if can? current_user, :push_code, @project
-      .nav-controls
+    .nav-controls
+      - if can? current_user, :push_code, @project
         = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
           New tag
-        .dropdown.inline
-          %button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} }
-            %span.light= @sort.humanize
-            %b.caret
-          %ul.dropdown-menu.dropdown-menu-align-right
-            %li
-              = link_to namespace_project_tags_path(sort: nil) do
-                Name
-              = link_to namespace_project_tags_path(sort: sort_value_recently_updated) do
-                = sort_title_recently_updated
-              = link_to namespace_project_tags_path(sort: sort_value_oldest_updated) do
-                = sort_title_oldest_updated
+      .dropdown.inline
+        %button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} }
+          %span.light= @sort.humanize
+          %b.caret
+        %ul.dropdown-menu.dropdown-menu-align-right
+          %li
+            = link_to namespace_project_tags_path(sort: nil) do
+              Name
+            = link_to namespace_project_tags_path(sort: sort_value_recently_updated) do
+              = sort_title_recently_updated
+            = link_to namespace_project_tags_path(sort: sort_value_oldest_updated) do
+              = sort_title_oldest_updated
 
   .tags
     - if @tags.any?
-- 
cgit v1.2.1