summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-07 05:11:26 +0000
committerRémy Coutable <remy@rymai.me>2016-07-07 05:11:26 +0000
commit9b75da80259c7a3bb410d601fea1e9c45c427a33 (patch)
treee5bc5027af724d33c98e1f35a17613bcf1002a85
parentc66a7b0e949d384448fc1097bf8c1af1d6b7324d (diff)
parent3646eb165c1ed0bb64ec6259ea285f00e46180f0 (diff)
downloadgitlab-ce-9b75da80259c7a3bb410d601fea1e9c45c427a33.tar.gz
Merge branch 'patch-3' into 'master'
Allow everyone to order tags, not only those who has access ## What does this MR do? Allows everyone to view tags by different order (by name, date, etc), not only those who has access ## Are there points in the code the reviewer needs to double check? Just check how it's rendered. ## Why was this MR needed? Because now I can't order other's project tags. ## What are the relevant issue numbers? #15438 ## Screenshots (if relevant) Exist in related issue. Look [one comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888763) and [just below there is another one](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888819). ## Does this MR meet the acceptance criteria? Probably, no need See merge request !5105
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/tags/index.html.haml28
2 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9627c08d428..ae094620bf6 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?