diff options
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 255f63db5c2..0db9e31031c 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -76,7 +76,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated end def conflict_resolution_path - if conflicts_can_be_resolved_in_ui? && conflicts_can_be_resolved_by?(current_user) + if conflicts.can_be_resolved_in_ui? && conflicts.can_be_resolved_by?(current_user) conflicts_namespace_project_merge_request_path(project.namespace, project, merge_request) end end @@ -141,6 +141,10 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated private + def conflicts + @conflicts ||= MergeRequests::Conflicts::ListService.new(merge_request) + end + def closing_issues @closing_issues ||= closes_issues(current_user) end |