Merge branch 'staging' into production

Leandro Santos
2 parents 71e09814 309e69be
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
lib/noosfero/api/session.rb
plugins/juventude
@@ -31,7 +31,7 @@ module Noosfero
       post "/login" do
         begin
           user ||= User.authenticate(params[:login], params[:password], environment)
-        rescue NoosferoExceptions::UserNotActivated => e
+        rescue User::UserNotActivated => e
           render_api_error!(e.message, 401)
         end
-Subproject commit 04705f4addcf4159df609353f407f119c7628350
+Subproject commit 008eabc0e296f9c7d62865a7a47965dbe9f65243
	@@ -31,7 +31,7 @@ module Noosfero		@@ -31,7 +31,7 @@ module Noosfero
31	post "/login" do	31	post "/login" do
32	begin	32	begin
33	user \|\|= User.authenticate(params[:login], params[:password], environment)	33	user \|\|= User.authenticate(params[:login], params[:password], environment)
34	- rescue NoosferoExceptions::UserNotActivated => e	34	+ rescue User::UserNotActivated => e
35	render_api_error!(e.message, 401)	35	render_api_error!(e.message, 401)
36	end	36	end
37		37