Commit
fc39396c6bb985fd3564329d67fc2b8ff422f478
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
Avoid ambiguity in members_by_name
| @@ -97,7 +97,7 @@ class Profile < ActiveRecord::Base |
| @@ -97,7 +97,7 @@ class Profile < ActiveRecord::Base |
97
| end |
97
| end |
98
| |
98
| |
99
| def members_by_name |
99
| def members_by_name |
100
| - members.order(:name) |
100
| + members.order('profiles.name') |
101
| end |
101
| end |
102
| |
102
| |
103
| class << self |
103
| class << self |