Commit
20446fe040f50016563b6c322bf8bcaf092f299e
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
| @@ -8,6 +8,10 @@ class User < ActiveRecord::Base |
| @@ -8,6 +8,10 @@ class User < ActiveRecord::Base |
8
| N_('Password confirmation') |
8
| N_('Password confirmation') |
9
| N_('Terms accepted') |
9
| N_('Terms accepted') |
10
| |
10
| |
| |
11
| + SEARCHABLE_FIELDS = { |
| |
12
| + :email => 5, |
| |
13
| + } |
| |
14
| + |
11
| def self.[](login) |
15
| def self.[](login) |
12
| self.find_by_login(login) |
16
| self.find_by_login(login) |
13
| end |
17
| end |