Move 'Forgot password' link to the right of password label

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e1ecfef80a3a72e476e5df211ee31e016bfe8e49..4974d99f14a432da888bde7b511950af2f0bbbf3 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -70,7 +70,6 @@ class UsersController < ApplicationController
       redirect_to @referer || { :controller => "site", :action => "index" }
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
       self.current_user = User.new(:email => params[:email],
       redirect_to @referer || { :controller => "site", :action => "index" }
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
       self.current_user = User.new(:email => params[:email],

-                                   :email_confirmation => params[:email],

                                    :display_name => params[:nickname],
                                    :auth_provider => params[:auth_provider],
                                    :auth_uid => params[:auth_uid])
                                    :display_name => params[:nickname],
                                    :auth_provider => params[:auth_provider],
                                    :auth_uid => params[:auth_uid])


@@ -336,7 +335,7 @@ class UsersController < ApplicationController
   ##
   # return permitted user parameters
   def user_params
   ##
   # return permitted user parameters
   def user_params

-    params.require(:user).permit(:email, :email_confirmation, :display_name,
+    params.require(:user).permit(:email, :display_name,

                                  :auth_provider, :auth_uid,
                                  :pass_crypt, :pass_crypt_confirmation,
                                  :consider_pd)
                                  :auth_provider, :auth_uid,
                                  :pass_crypt, :pass_crypt_confirmation,
                                  :consider_pd)