diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-21 14:29:04 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-24 10:48:24 +0100 |
commit | 68a44c6566f5730e5fe600262d5cb3acd66426e1 (patch) | |
tree | 31b7707469747825a60fcca35b0659f88f96213f | |
parent | fcdeddc6f7ee3f66284d05d3f4bd5ef274c5823d (diff) | |
download | gitlab-ce-38105-tags-pre-release.tar.gz |
Adds pre-release label to tags page38105-tags-pre-release
Adds a pre-release label when a tag
is created for a pre-release
-rw-r--r-- | app/helpers/tags_helper.rb | 4 | ||||
-rw-r--r-- | app/views/projects/tags/_tag.html.haml | 4 | ||||
-rw-r--r-- | spec/features/projects/tags/user_views_tags_spec.rb | 15 |
3 files changed, 23 insertions, 0 deletions
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index de0b92b6fd7..f24cfb8536e 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -28,4 +28,8 @@ module TagsHelper def protected_tag?(project, tag) ProtectedTag.protected?(project, tag.name) end + + def pre_release_tag?(project, tag) + true + end end diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml index b1432917f1d..1aacb230bc8 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -9,6 +9,10 @@ %span.badge.badge-success.prepend-left-4 = s_('TagsPage|protected') + - if pre_release_tag?(@project, tag) + %span.badge.badge-warning.prepend-left-4 + = s_('TagsPage|Pre-release') + - if tag.message.present? = strip_gpg_signature(tag.message) diff --git a/spec/features/projects/tags/user_views_tags_spec.rb b/spec/features/projects/tags/user_views_tags_spec.rb index f344b682715..b04cb0cdafc 100644 --- a/spec/features/projects/tags/user_views_tags_spec.rb +++ b/spec/features/projects/tags/user_views_tags_spec.rb @@ -66,4 +66,19 @@ describe 'User views tags', :feature do end end end + + context 'with pre-release' do + let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } + let(:user) { create(:user) } + + before do + project.add_developer(user) + sign_in(user) + visit project_tags_path(project) + end + + it 'renders pre-release tag' do + expect(page).to have_content('Pre-release') + end + end end |