Commit c1e467b7 authored by Sean McGivern's avatar Sean McGivern

Fix conflicts in MergeRequest model

parent c0b61bae
...@@ -984,17 +984,10 @@ class MergeRequest < ActiveRecord::Base ...@@ -984,17 +984,10 @@ class MergeRequest < ActiveRecord::Base
true true
end end
<<<<<<< HEAD
def base_pipeline def base_pipeline
@base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha) @base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
end end
def update_project_counter_caches?
state_changed?
end
=======
>>>>>>> upstream/master
def update_project_counter_caches def update_project_counter_caches
Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
end end
......
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