summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-03-01 11:20:05 +0000
committerTim Zallmann <tzallmann@gitlab.com>2019-03-01 11:20:05 +0000
commit728e80798b53e05d4d94c54151b688366be22538 (patch)
tree2f59bc8278da3ea748336705e51c402080917c95
parent31353188f84bd3e57318b4b1aa2da93a9d9605d1 (diff)
parent8e7d469d6f2c3d386d47d4e0d34022a2beeb31bc (diff)
downloadgitlab-ce-728e80798b53e05d4d94c54151b688366be22538.tar.gz
Merge branch '58274-folder-icon-in-tags-page' into 'master'
Use `folder-open` from sprite icons for Browse Files button in Tag page Closes #58274 See merge request gitlab-org/gitlab-ce!25635
-rw-r--r--app/views/projects/tags/show.html.haml2
-rw-r--r--changelogs/unreleased/58274-folder-icon-in-tags-page.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index feeaf799f51..8ee1407d9d9 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -23,7 +23,7 @@
= link_to edit_project_tag_release_path(@project, @tag.name), class: 'btn btn-edit controls-item has-tooltip', title: s_('TagsPage|Edit release notes') do
= icon("pencil")
= link_to project_tree_path(@project, @tag.name), class: 'btn controls-item has-tooltip', title: s_('TagsPage|Browse files') do
- = icon('files-o')
+ = sprite_icon('folder-open')
= link_to project_commits_path(@project, @tag.name), class: 'btn controls-item has-tooltip', title: s_('TagsPage|Browse commits') do
= icon('history')
.btn-container.controls-item
diff --git a/changelogs/unreleased/58274-folder-icon-in-tags-page.yml b/changelogs/unreleased/58274-folder-icon-in-tags-page.yml
new file mode 100644
index 00000000000..db8128b8dfd
--- /dev/null
+++ b/changelogs/unreleased/58274-folder-icon-in-tags-page.yml
@@ -0,0 +1,5 @@
+---
+title: Use 'folder-open' from sprite icons for Browse Files button in Tag page
+merge_request: 25635
+author:
+type: fixed