summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-28 17:18:36 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-28 17:18:36 +0000
commitff8379f72beaf5cb7b7dae1e8cc5604f39fe65ba (patch)
tree69a1d777128dd3a1ca8bdbd2af650bb0b103c552
parent0226fb0e1f7b1aca6cd1258371a03245df8c1787 (diff)
parentfca0c8d7f2e56a75d16a0b0d8b9155afa2d4cc02 (diff)
downloadgitlab-ce-ff8379f72beaf5cb7b7dae1e8cc5604f39fe65ba.tar.gz
Merge branch 'issue-tags-layout' into 'master'
Fix 'New Tag' layout on Tags page See merge request !9176
-rw-r--r--app/views/projects/tags/index.html.haml2
-rw-r--r--changelogs/unreleased/issue-tags-layout.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index e2f132f7742..7f9a44e565f 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -3,7 +3,7 @@
= render "projects/commits/head"
.flex-list{ class: container_class }
- .top-area.flex-row
+ .top-area.adjust
.nav-text.row-main-content
Tags give the ability to mark specific points in history as being important
diff --git a/changelogs/unreleased/issue-tags-layout.yml b/changelogs/unreleased/issue-tags-layout.yml
new file mode 100644
index 00000000000..abf4a609932
--- /dev/null
+++ b/changelogs/unreleased/issue-tags-layout.yml
@@ -0,0 +1,4 @@
+---
+title: Fix 'New Tag' layout on Tags page
+merge_request:
+author: Robert Marcano