Download as
Browse Code »

Commit ebd4f04a5e425fd0f0a9a8fc874a90488635bdd5

Authored by Weblate
2 parents 8f2aa3e1 1a854cf9
Exists in master and in 20 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_pagination, api_private_token, article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 4 additions and 1 deletions   Show diff stats
plugins/remote_user/lib/remote_user_plugin.rb
  Diff comments   View file @ebd4f04
@@ -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