Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 1 insertions, 15 deletions

diff --git a/app/presenters/issue_presenter.rb b/app/presenters/issue_presenter.rb
index 75f6d749acb..9b4e7e22165 100644
--- a/app/presenters/issue_presenter.rb
+++ b/app/presenters/issue_presenter.rb
@@ -4,9 +4,7 @@ class IssuePresenter < Gitlab::View::Presenter::Delegated
   presents ::Issue, as: :issue
 
   def issue_path
-    return url_builder.build(issue, only_path: true) unless use_work_items_path?
-
-    project_work_items_path(issue.project, work_items_path: issue.id)
+    web_path
   end
 
   delegator_override :subscribed?
@@ -17,18 +15,6 @@ class IssuePresenter < Gitlab::View::Presenter::Delegated
   def project_emails_disabled?
     issue.project.emails_disabled?
   end
-
-  def web_url
-    return super unless use_work_items_path?
-
-    project_work_items_url(issue.project, work_items_path: issue.id)
-  end
-
-  private
-
-  def use_work_items_path?
-    issue.issue_type == 'task' && issue.project.work_items_feature_flag_enabled?
-  end
 end
 
 IssuePresenter.prepend_mod_with('IssuePresenter')