summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-02-05 17:54:35 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-02-05 17:54:35 +0000
commit2150ed4094ddb67d7b403cd56360700c80e7d928 (patch)
treed8b0fa68d9e33bbf332d41ceab0f91e370429e78
parentcf9e29672ce0df9647eecd94d099d15dc1bdac0e (diff)
parenta0d714fe89756115771813b6e8e683d8ec5d29b0 (diff)
downloadgitlab-ce-2150ed4094ddb67d7b403cd56360700c80e7d928.tar.gz
Merge branch '42584-fix-margins-in-tag-list' into 'master'
Resolve "Different margins between buttons in tag list" Closes #42584 See merge request gitlab-org/gitlab-ce!16927
-rw-r--r--app/views/projects/tags/_tag.html.haml2
-rw-r--r--changelogs/unreleased/42584-fix-margins-in-tag-list.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 55e45a5e954..3d5f92f9aaa 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -24,7 +24,7 @@
.wiki
= markdown_field(release, :description)
- .row-fixed-content.controls
+ .row-fixed-content.controls.flex-row
= render 'projects/buttons/download', project: @project, ref: tag.name, pipeline: @tags_pipelines[tag.name]
- if can?(current_user, :push_code, @project)
diff --git a/changelogs/unreleased/42584-fix-margins-in-tag-list.yml b/changelogs/unreleased/42584-fix-margins-in-tag-list.yml
new file mode 100644
index 00000000000..38b3dd85fd8
--- /dev/null
+++ b/changelogs/unreleased/42584-fix-margins-in-tag-list.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes different margins between buttons in tag list
+merge_request: 16927
+author: Jacopo Beschi @jacopo-beschi
+type: fixed