diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 06:17:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 06:17:36 +0300 |
| commit | 20b517258a70b3bd1cb0d17cb77565a82ce098b5 (patch) | |
| tree | e38311e4511c23085eccdf91e678365f0947a053 /app/presenters/merge_request_presenter.rb | |
| parent | 51d1545877fb481aa14498a18b004867f28d7cce (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters/merge_request_presenter.rb')
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 8450679dd79..2dc2ecad1b4 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true class MergeRequestPresenter < Gitlab::View::Presenter::Delegated - include ActionView::Helpers::UrlHelper include GitlabRoutingHelper include MarkupHelper include TreeHelper @@ -290,6 +289,11 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated def user_can_fork_project? can?(current_user, :fork_project, project) end + + # Avoid including ActionView::Helpers::UrlHelper + def link_to(*args) + ApplicationController.helpers.link_to(*args) + end end MergeRequestPresenter.prepend_mod_with('MergeRequestPresenter') |