Commit 5b94a7da authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix conflicts in app/finders/issuable_finder.rb and spec/models/user_spec.rb

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4048249b
......@@ -338,8 +338,6 @@ class IssuableFinder
# Ensure we always have an explicit sort order (instead of inheriting
# multiple orders when combining ActiveRecord::Relation objects).
params[:sort] ? items.sort_by_attribute(params[:sort], excluded_labels: label_names) : items.reorder(id: :desc)
<<<<<<< HEAD
=======
end
def by_assignee(items)
......@@ -352,7 +350,6 @@ class IssuableFinder
end
items
>>>>>>> upstream/master
end
def by_author(items)
......
......@@ -1479,7 +1479,6 @@ describe User do
end
end
<<<<<<< HEAD
describe "#existing_member?" do
it "returns true for exisitng user" do
create :user, email: "bruno@example.com"
......@@ -1501,8 +1500,6 @@ describe User do
end
end
=======
>>>>>>> upstream/master
describe '#sort_by_attribute' do
before do
described_class.delete_all
......
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