Merge branch 'omniauth' of github.com:sickill/ascii.io into omniauth

app/controllers/sessions_controller.rb

@@ -15,8 +15,7 @@ class SessionsController < ApplicationController
   end
 
   def failure
-    flash[:error] = params[:message]
-    redirect_to root_url
+    redirect_to root_url, :alert => params[:message]
   end
 
   private

spec/controllers/sessions_controller_spec.rb

@@ -80,7 +80,7 @@ describe SessionsController do
     end
 
     it "should redirects to root_url and set error message" do
-      flash[:error].should == message
+      flash[:alert].should == message
       should redirect_to(root_url)
     end
   end