Commit fce0a476 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'releases-page-semver' into 'master'

Doc: comply to semver by replacing vX.Y by vX.Y.Z

See merge request gitlab-org/gitlab!49390
parents e2cb6ef4 1e67a108
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
<gl-sprintf <gl-sprintf
:message=" :message="
__( __(
'Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}v1.0%{codeEnd}, %{codeStart}v2.0-pre%{codeEnd}.', 'Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}v1.0.0%{codeEnd}, %{codeStart}v2.1.0-pre%{codeEnd}.',
) )
" "
> >
......
...@@ -25476,7 +25476,7 @@ msgstr "" ...@@ -25476,7 +25476,7 @@ msgstr ""
msgid "Releases are based on Git tags and mark specific points in a project's development history. They can contain information about the type of changes and can also deliver binaries, like compiled versions of your software." msgid "Releases are based on Git tags and mark specific points in a project's development history. They can contain information about the type of changes and can also deliver binaries, like compiled versions of your software."
msgstr "" msgstr ""
msgid "Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}v1.0%{codeEnd}, %{codeStart}v2.0-pre%{codeEnd}." msgid "Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}v1.0.0%{codeEnd}, %{codeStart}v2.1.0-pre%{codeEnd}."
msgstr "" msgstr ""
msgid "Releases documentation" msgid "Releases documentation"
......
...@@ -37,7 +37,7 @@ RSpec.describe 'User edits Release', :js do ...@@ -37,7 +37,7 @@ RSpec.describe 'User edits Release', :js do
end end
it 'renders the edit Release form' do it 'renders the edit Release form' do
expect(page).to have_content('Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0, v2.0-pre.') expect(page).to have_content('Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0.0, v2.1.0-pre.')
expect(find_field('Tag name', disabled: true).value).to eq(release.tag) expect(find_field('Tag name', disabled: true).value).to eq(release.tag)
expect(find_field('Release title').value).to eq(release.name) expect(find_field('Release title').value).to eq(release.name)
......
...@@ -112,7 +112,7 @@ describe('Release edit/new component', () => { ...@@ -112,7 +112,7 @@ describe('Release edit/new component', () => {
it('renders the description text at the top of the page', () => { it('renders the description text at the top of the page', () => {
expect(wrapper.find('.js-subtitle-text').text()).toBe( expect(wrapper.find('.js-subtitle-text').text()).toBe(
'Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0, v2.0-pre.', 'Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0.0, v2.1.0-pre.',
); );
}); });
......
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