Commit dfe9f0bc authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Remove duplicate calls of MergeRequest#can_be_reverted?

parent 64416126
......@@ -3,6 +3,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
include GitlabRoutingHelper
include MarkupHelper
include TreeHelper
include Gitlab::Utils::StrongMemoize
presents :merge_request
......@@ -43,7 +44,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
end
def revert_in_fork_path
if user_can_fork_project? && can_be_reverted?(current_user)
if user_can_fork_project? && _can_be_reverted?
continue_params = {
to: merge_request_path(merge_request),
notice: "#{edit_in_new_fork_notice} Try to cherry-pick this commit again.",
......@@ -151,7 +152,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
end
def can_revert_on_current_merge_request?
user_can_collaborate_with_project? && can_be_reverted?(current_user)
user_can_collaborate_with_project? && _can_be_reverted?
end
def can_cherry_pick_on_current_merge_request?
......@@ -164,6 +165,13 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
private
# Method overrides doesn't work for Gitlab::View::Presenter::Delegated
def _can_be_reverted?
strong_memoize(:can_be_reverted) do
can_be_reverted?(current_user)
end
end
def conflicts
@conflicts ||= MergeRequests::Conflicts::ListService.new(merge_request)
end
......
---
title: Remove duplicate calls of MergeRequest#can_be_reverted?
merge_request:
author:
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment