Commit
ebd4f04a5e425fd0f0a9a8fc874a90488635bdd5
Authored by
Weblate
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
Merge remote-tracking branch 'origin/master'
|
| @@ -48,8 +48,11 @@ class RemoteUserPlugin < Noosfero::Plugin |
| @@ -48,8 +48,11 @@ class RemoteUserPlugin < Noosfero::Plugin |
|
48
| end |
48
| end |
|
49
| end |
49
| end |
|
50
| end |
50
| end |
|
| |
51
| + rescue ::ActiveRecord::RecordInvalid |
|
| |
52
| + session[:notice] = _('Could not create the remote user.') |
|
| |
53
| + render_404 |
|
51
| rescue |
54
| rescue |
|
52
| - session[:notice] = _('Could not create the remote_user.') |
55
| + session[:notice] = _("Could not log in.") |
|
53
| render_404 |
56
| render_404 |
|
54
| end |
57
| end |
|
55
| end |
58
| end |