'fixed again'

app/controllers/password_resets_controller.rb

 class PasswordResetsController < ApplicationController
 class PasswordResetsController < ApplicationController
-  before_action :get_user, only: [:edit, :update]
-  before_action :valid_user, only: [:edit, :update]
-  before_action :check_expiration, only: [:edit, :update]
+  before_action :get_user, :valid_user, :check_expiration, only: [:edit, :update]
 
 
   def new
   def new
   end
   end

app/controllers/users_controller.rb

@@ -27,8 +27,7 @@ class UsersController < ApplicationController
     @user.validate_password = true
     @user.validate_password = true
 
 
     if @user.update_attributes(user_params)
     if @user.update_attributes(user_params)
-      @user.update_attributes(:activated => true)
-      @user.update_attributes(:activated_at => Time.zone.now)
+      @user.update_attributes(:activated => true,:activated_at => Time.zone.now)
       flash[:success] = "Update success"
       flash[:success] = "Update success"
       redirect_to my_page_path
       redirect_to my_page_path
     else
     else

app/models/user.rb

@@ -23,8 +23,7 @@ class User < ApplicationRecord
 
 
   def create_reset_digest
   def create_reset_digest
     self.reset_token = generate_token
     self.reset_token = generate_token
-    update_attributes(:reset_digest => digest(reset_token))
-    update_attributes(:reset_sent_at => Time.zone.now)
+    update_attributes(:reset_digest => digest(reset_token),:reset_sent_at => Time.zone.now)
   end
   end
 
 
   def send_password_reset_email
   def send_password_reset_email