Commit 102c1b63 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'bvl-document-lightweight-vs-annotated-tag' into 'master'

Document kind of tag that is created from the UI

See merge request gitlab-org/gitlab!18194
parents 6cbb2502 745b07a9
...@@ -28,4 +28,14 @@ module TagsHelper ...@@ -28,4 +28,14 @@ module TagsHelper
def protected_tag?(project, tag) def protected_tag?(project, tag)
ProtectedTag.protected?(project, tag.name) ProtectedTag.protected?(project, tag.name)
end end
def tag_description_help_text
text = s_('TagsPage|Optionally, add a message to the tag. Leaving this blank creates '\
'a %{link_start}lightweight tag.%{link_end}') % {
link_start: '<a href="https://git-scm.com/book/en/v2/Git-Basics-Tagging\" target="_blank" rel="noopener noreferrer">',
link_end: '</a>'
}
text.html_safe
end
end end
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.col-sm-10 .col-sm-10
= text_area_tag :message, @message, required: false, class: 'form-control', rows: 5 = text_area_tag :message, @message, required: false, class: 'form-control', rows: 5
.form-text.text-muted .form-text.text-muted
= s_('TagsPage|Optionally, add a message to the tag.') = tag_description_help_text
%hr %hr
.form-group.row .form-group.row
= label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label col-sm-2' = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label col-sm-2'
......
...@@ -15823,7 +15823,7 @@ msgstr "" ...@@ -15823,7 +15823,7 @@ msgstr ""
msgid "TagsPage|New tag" msgid "TagsPage|New tag"
msgstr "" msgstr ""
msgid "TagsPage|Optionally, add a message to the tag." msgid "TagsPage|Optionally, add a message to the tag. Leaving this blank creates a %{link_start}lightweight tag.%{link_end}"
msgstr "" msgstr ""
msgid "TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page." msgid "TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment