Commit
35c3c598acbe898c1914bd13da302d27ff22ee0b
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
includes email in User::SEARCHABLE_FIELDS since it is reasonable
|
| @@ -11,6 +11,10 @@ class User < ActiveRecord::Base |
| @@ -11,6 +11,10 @@ class User < ActiveRecord::Base |
|
11
| N_('Password confirmation') |
11
| N_('Password confirmation') |
|
12
| N_('Terms accepted') |
12
| N_('Terms accepted') |
|
13
| |
13
| |
|
| |
14
| + SEARCHABLE_FIELDS = { |
|
| |
15
| + :email => 5, |
|
| |
16
| + } |
|
| |
17
| + |
|
14
| def self.[](login) |
18
| def self.[](login) |
|
15
| self.find_by_login(login) |
19
| self.find_by_login(login) |
|
16
| end |
20
| end |
