summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-23 10:25:20 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-23 10:25:20 +0000
commitdcd4710137218dd3d97ad4fbe104f6897bddf41a (patch)
treef2473c9bf574e8e87459b0218b5b8912839fbedf
parentdb02af3e2496203890c9ab1aa5a17eb891071682 (diff)
parent5c747ded7ecc1d7da418a854d12ad2906b173b7b (diff)
downloadgitlab-ce-dcd4710137218dd3d97ad4fbe104f6897bddf41a.tar.gz
Merge branch 'dev-issue-24554' into 'master'
Edit help text to clarify that tags are annotated. Closes #24554 See merge request !7553
-rw-r--r--app/views/projects/tags/new.html.haml2
-rw-r--r--changelogs/unreleased/dev-issue-24554.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 3a097750d6e..c06a413eb2f 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -23,7 +23,7 @@
= label_tag :message, nil, class: 'control-label'
.col-sm-10
= text_area_tag :message, nil, required: false, tabindex: 3, class: 'form-control', rows: 5
- .help-block Optionally, enter a message to create an annotated tag.
+ .help-block Optionally, add a message to the tag.
%hr
.form-group
= label_tag :release_description, 'Release notes', class: 'control-label'
diff --git a/changelogs/unreleased/dev-issue-24554.yml b/changelogs/unreleased/dev-issue-24554.yml
new file mode 100644
index 00000000000..0bb362b9325
--- /dev/null
+++ b/changelogs/unreleased/dev-issue-24554.yml
@@ -0,0 +1,4 @@
+---
+title: Edit help text to clarify annotated tag creation.
+merge_request:
+author: Liz Lam