kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve conflicts in app/models/user.rb

Browse source
This commit is contained in:
Douwe Maan 2017-12-11 11:10:15 +01:00
parent 0f81167570
commit f71e48a0d0
1 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/models/user.rb
View file

@ -315,13 +315,8 @@ class User < ActiveRecord::Base
#
# Returns an ActiveRecord::Relation.
def search(query)
<<<<<<< HEAD
=======
table = arel_table
query = query.downcase
pattern = User.to_pattern(query)
>>>>>>> f45fc58d84... Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'
order = <<~SQL
CASE
WHEN users.name = %{query} THEN 0
@ -331,16 +326,11 @@ class User < ActiveRecord::Base
END
SQL
<<<<<<< HEAD
fuzzy_search(query, [:name, :email, :username])
.reorder(order % { query: ActiveRecord::Base.connection.quote(query) }, :name)
=======
where(
table[:name].matches(pattern)
.or(table[:email].eq(query))
.or(table[:username].matches(pattern))
fuzzy_arel_match(:name, query)
.or(fuzzy_arel_match(:username, query))
.or(arel_table[:email].eq(query))
).reorder(order % { query: ActiveRecord::Base.connection.quote(query) }, :name)
>>>>>>> f45fc58d84... Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'
end
# searches user by given pattern
@ -348,28 +338,18 @@ class User < ActiveRecord::Base
# This method uses ILIKE on PostgreSQL and LIKE on MySQL.
def search_with_secondary_emails(query)
query = query.downcase
email_table = Email.arel_table
<<<<<<< HEAD
matched_by_emails_user_ids = email_table
.project(email_table[:user_id])
.where(Email.fuzzy_arel_match(:email, query))
.where(email_table[:email].eq(query))
where(
fuzzy_arel_match(:name, query)
.or(fuzzy_arel_match(:email, query))
.or(fuzzy_arel_match(:username, query))
.or(arel_table[:email].eq(query))
.or(arel_table[:id].in(matched_by_emails_user_ids))
=======
query = query.downcase
pattern = User.to_pattern(query)
matched_by_emails_user_ids = email_table.project(email_table[:user_id]).where(email_table[:email].eq(query))
where(
table[:name].matches(pattern)
.or(table[:email].eq(query))
.or(table[:username].matches(pattern))
.or(table[:id].in(matched_by_emails_user_ids))
>>>>>>> f45fc58d84... Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'
)
end