Merge branch '51372-remove-milestone-tabs-deprecation-message' into 'master'

Remove deprecation message for milestone tabs

See merge request gitlab-org/gitlab-ce!32252

4 files changed, 5 insertions, 20 deletions

diff --git a/app/views/projects/milestones/_deprecation_message.html.haml b/app/views/projects/milestones/_deprecation_message.html.haml
deleted file mode 100644
index b2cca3690d6..00000000000
--- a/app/views/projects/milestones/_deprecation_message.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.banner-callout.compact.milestone-deprecation-message.prepend-top-20
-  .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg'
-  .banner-body.prepend-left-10.append-right-10
-    %h5.banner-title.prepend-top-0
-      = _('The tabs below will be removed in a future version')
-    %p.milestone-banner-text
-      = _('Learn more about %{issue_boards_url}, to keep track of issues in multiple lists, using labels, assignees, and milestones. If you’re missing something from issue boards, please create an issue on %{gitlab_issues_url}.').html_safe % { issue_boards_url: link_to(_('issue boards'), help_page_url('user/project/issue_board'), target: '_blank', rel: 'noopener noreferrer'), gitlab_issues_url: link_to(_('GitLab’s issue tracker'), 'https://gitlab.com/gitlab-org/gitlab-ce/issues', target: '_blank', rel: 'noopener noreferrer') }
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 1cee8be604a..9130dea2715 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -66,6 +66,5 @@
     .alert.alert-success.prepend-top-default
       %span= _('All issues for this milestone are closed. You may close this milestone now.')
 
-  = render 'deprecation_message'
   = render 'shared/milestones/tabs', milestone: @milestone
   = render 'shared/milestones/sidebar', milestone: @milestone, project: @project, affix_offset: 153
diff --git a/changelogs/unreleased/51372-remove-milestone-tabs-deprecation-message.yml b/changelogs/unreleased/51372-remove-milestone-tabs-deprecation-message.yml
new file mode 100644
index 00000000000..5f05b150b93
--- /dev/null
+++ b/changelogs/unreleased/51372-remove-milestone-tabs-deprecation-message.yml
@@ -0,0 +1,5 @@
+---
+title: Remove deprecation message for milestone tabs
+merge_request: 32252
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a1836646b1a..dbf28db91dc 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5334,9 +5334,6 @@ msgstr ""
 msgid "GitLab.com import"
 msgstr ""
 
-msgid "GitLab’s issue tracker"
-msgstr ""
-
 msgid "Gitaly"
 msgstr ""
 
@@ -6586,9 +6583,6 @@ msgstr ""
 msgid "Learn more"
 msgstr ""
 
-msgid "Learn more about %{issue_boards_url}, to keep track of issues in multiple lists, using labels, assignees, and milestones. If you’re missing something from issue boards, please create an issue on %{gitlab_issues_url}."
-msgstr ""
-
 msgid "Learn more about Auto DevOps"
 msgstr ""
 
@@ -11553,9 +11547,6 @@ msgstr ""
 msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time."
 msgstr ""
 
-msgid "The tabs below will be removed in a future version"
-msgstr ""
-
 msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
 msgstr ""
 
@@ -13814,9 +13805,6 @@ msgstr ""
 msgid "issue"
 msgstr ""
 
-msgid "issue boards"
-msgstr ""
-
 msgid "it is stored externally"
 msgstr ""