diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-22 15:27:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-22 15:27:15 +0000 |
| commit | c4904d570c2c5094d2d2bfee5d243b39556fdc89 (patch) | |
| tree | dab12bae640f5e84f2eb4973e1bce76ed9f1baca /app/models | |
| parent | 834dee687833fa7beca67e47a216261b23faa66b (diff) | |
| parent | 580fa6becf28670c77529993a08fcd0f22491153 (diff) | |
| download | gitlab-ce-c4904d570c2c5094d2d2bfee5d243b39556fdc89.tar.gz | |
Merge branch '41673-blank-query-members-api' into 'master'
Resolve "Project/#/Members?query= blank causes 500 error"
Closes #41673
See merge request gitlab-org/gitlab-ce!16235
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 09aa5a7b318..9403da98268 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -318,6 +318,8 @@ class User < ActiveRecord::Base # # Returns an ActiveRecord::Relation. def search(query) + return none if query.blank? + query = query.downcase order = <<~SQL @@ -341,6 +343,8 @@ class User < ActiveRecord::Base # This method uses ILIKE on PostgreSQL and LIKE on MySQL. def search_with_secondary_emails(query) + return none if query.blank? + query = query.downcase email_table = Email.arel_table |