diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/presenters/merge_request_presenter.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/presenters/merge_request_presenter.rb')
-rw-r--r-- | app/presenters/merge_request_presenter.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index bccf0340749..1ff02412994 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -179,7 +179,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated return false unless source_branch_exists? !!::Gitlab::UserAccess - .new(current_user, project: source_project) + .new(current_user, container: source_project) .can_push_to_branch?(source_branch) end @@ -202,10 +202,6 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated end end - def web_url - Gitlab::UrlBuilder.build(merge_request) - end - def subscribed? merge_request.subscribed?(current_user, merge_request.target_project) end |