Commit cf1dc1ba authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '296225-Display-tag-messages-with-line-endings' into 'master'

Display tag messages with line endings

See merge request gitlab-org/gitlab!75896
parents 4c56f7a1 9a23492d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- release = @releases.find { |release| release.tag == tag.name } - release = @releases.find { |release| release.tag == tag.name }
- commit_status = @tag_pipeline_statuses[tag.name] unless @tag_pipeline_statuses.nil? - commit_status = @tag_pipeline_statuses[tag.name] unless @tag_pipeline_statuses.nil?
%li.flex-row.js-tag-list{ class: "gl-white-space-normal!" } %li.flex-row.js-tag-list{ class: "gl-white-space-normal! gl-align-items-flex-start!" }
.row-main-content .row-main-content
= sprite_icon('tag') = sprite_icon('tag')
= link_to tag.name, project_tag_path(@project, tag.name), class: 'item-title ref-name' = link_to tag.name, project_tag_path(@project, tag.name), class: 'item-title ref-name'
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
%span.badge.badge-success.gl-ml-2.gl-badge.sm.badge-pill %span.badge.badge-success.gl-ml-2.gl-badge.sm.badge-pill
= s_('TagsPage|protected') = s_('TagsPage|protected')
- if tag.message.present?
 
= strip_signature(tag.message)
- if commit - if commit
.block-truncated .block-truncated
= render 'projects/branches/commit', commit: commit, project: @project = render 'projects/branches/commit', commit: commit, project: @project
...@@ -28,6 +24,10 @@ ...@@ -28,6 +24,10 @@
= _("Release") = _("Release")
= link_to release.name, project_releases_path(@project, anchor: release.tag), class: 'gl-text-blue-600!' = link_to release.name, project_releases_path(@project, anchor: release.tag), class: 'gl-text-blue-600!'
- if tag.message.present?
%pre.wrap
= strip_signature(tag.message)
.row-fixed-content.controls.flex-row .row-fixed-content.controls.flex-row
- if tag.has_signature? - if tag.has_signature?
= render partial: 'projects/commit/signature', object: tag.signature = render partial: 'projects/commit/signature', object: tag.signature
......
...@@ -21,7 +21,8 @@ RSpec.describe 'Project > Tags', :js do ...@@ -21,7 +21,8 @@ RSpec.describe 'Project > Tags', :js do
context 'page with tags list' do context 'page with tags list' do
it 'shows tag name' do it 'shows tag name' do
expect(page).to have_content 'v1.1.0 Version 1.1.0' expect(page).to have_content 'v1.1.0'
expect(page).to have_content 'Version 1.1.0'
end end
it 'shows tag edit button' do it 'shows tag edit button' do
......
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