Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

4 files changed, 15 insertions, 9 deletions

diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 0ee3b89b629..7654150509e 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -21,7 +21,7 @@
       .text-secondary
         = sprite_icon("rocket", size: 12)
         = _("Release")
-        = link_to release.name, project_releases_path(@project, anchor: release.tag), class: 'gl-text-blue-600!'
+        = link_to release.name, project_release_path(@project, release), class: 'gl-text-blue-600!'
 
     - if tag.message.present?
       %pre.wrap
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index a654d0a8863..2721f94134c 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -38,3 +38,6 @@
             = s_('TagsPage|Use git tag command to add a new one:')
             %br
             %span.monospace git tag -a v1.4 -m 'version 1.4'
+
+- if can?(current_user, :admin_tag, @project)
+  .js-delete-tag-modal
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 4281152225a..3b546888375 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -2,13 +2,11 @@
 - default_ref = params[:ref] || @project.default_branch
 
 - if @error
-  .gl-alert.gl-alert-danger
-    = sprite_icon('error', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-    %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
-      = sprite_icon('close', css_class: 'gl-icon')
-    = @error
+  = render Pajamas::AlertComponent.new(variant: :danger, dismissible: true, close_button_options: { class: 'gl-alert-dismiss' }) do |c|
+    = c.body do
+      = @error
 
-%h3.page-title
+%h1.page-title.gl-font-size-h-display
   = s_('TagsPage|New Tag')
 %hr
 
@@ -52,7 +50,9 @@
         = render 'shared/zen', attr: :release_description, classes: 'note-textarea', placeholder: s_('TagsPage|Write your release notes or drag files here…'), current_text: @release_description, qa_selector: 'release_notes_field'
         = render 'shared/notes/hints'
   .form-actions.gl-display-flex
-    = button_tag s_('TagsPage|Create tag'), class: 'gl-button btn btn-confirm gl-mr-3', data: { qa_selector: "create_tag_button" }
-    = link_to s_('TagsPage|Cancel'), project_tags_path(@project), class: 'gl-button btn btn-default btn-cancel'
+    = render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { class: 'gl-mr-3', data: { qa_selector: "create_tag_button" }, type: 'submit' }) do
+      = s_('TagsPage|Create tag')
+    = render Pajamas::ButtonComponent.new(href: project_tags_path(@project)) do
+      = s_('TagsPage|Cancel')
 -# haml-lint:disable InlineJavaScript
 %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index c1b78d3258d..2a68ad37c1e 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -63,3 +63,6 @@
       = markdown_field(@release, :description)
   - else
     = s_('TagsPage|This tag has no release notes.')
+
+- if can?(current_user, :admin_tag, @project)
+  .js-delete-tag-modal