summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2018-10-22 19:13:58 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2018-10-22 19:13:58 +0000
commit9fe46d37930d4e03af3ffc8c24b15a50be533685 (patch)
treebc83cd304d5ade4672b0d4ca71471e8358a83c3d
parent616b73f2e6ead6b1d6e6214646ce81f07f295399 (diff)
parent0d07ade8d716499bdee302b9880c96a89ee1840f (diff)
downloadgitlab-ce-9fe46d37930d4e03af3ffc8c24b15a50be533685.tar.gz
Merge branch 'change-branch-font-type-in-tag-creation' into 'master'
Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
-rw-r--r--app/views/projects/tags/new.html.haml3
-rw-r--r--changelogs/unreleased/change-branch-font-type-in-tag-creation.yml5
-rw-r--r--changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml2
3 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 24724394259..5e6d06d980e 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -20,8 +20,9 @@
.col-sm-10.create-from
.dropdown
= hidden_field_tag :ref, default_ref
- = button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide js-branch-select', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
+ = button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide js-branch-select monospace', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
.text-left.dropdown-toggle-text= default_ref
+ = icon('chevron-down')
= render 'shared/ref_dropdown', dropdown_class: 'wide'
.form-text.text-muted
= s_('TagsPage|Existing branch name, tag, or commit SHA')
diff --git a/changelogs/unreleased/change-branch-font-type-in-tag-creation.yml b/changelogs/unreleased/change-branch-font-type-in-tag-creation.yml
new file mode 100644
index 00000000000..0f46efb693f
--- /dev/null
+++ b/changelogs/unreleased/change-branch-font-type-in-tag-creation.yml
@@ -0,0 +1,5 @@
+---
+title: Change branch font type in tag creation
+merge_request: 22454
+author: George Tsiolis
+type: other
diff --git a/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml b/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml
index c1f7a2a40c7..d2a65d48d8d 100644
--- a/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml
+++ b/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml
@@ -1,5 +1,5 @@
---
title: Remove empty spec describe blocks
merge_request: 22451
-author: george Tsiolis
+author: George Tsiolis
type: other