Skip to content

G
gitlab-ce
Commit 03247eae authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/finders/merge_requests_finder.rb

parent cbf9b7ce
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/finders/merge_requests_finder.rb
View file @ 03247eae
...@@ -33,7 +33,6 @@ class MergeRequestsFinder < IssuableFinder ...@@ -33,7 +33,6 @@ class MergeRequestsFinder < IssuableFinder
private private
<<<<<<< HEAD
def by_assignee(items) def by_assignee(items)
if assignee if assignee
items = items.where(assignee_id: assignee.id) items = items.where(assignee_id: assignee.id)
...@@ -46,8 +45,6 @@ class MergeRequestsFinder < IssuableFinder ...@@ -46,8 +45,6 @@ class MergeRequestsFinder < IssuableFinder
items items
end end
=======
>>>>>>> upstream/master
def source_branch def source_branch
@source_branch ||= params[:source_branch].presence @source_branch ||= params[:source_branch].presence
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7