Merge branch 'following-users'

Author: mhartl

app/controllers/users_controller.rb

@@ -74,11 +74,11 @@ def user_params
     # Confirms the correct user.
     def correct_user
       @user = User.find(params[:id])
-      redirect_to(root_url) unless @user == current_user
+      redirect_to(root_url, status: :see_other) unless current_user?(@user)
     end
 
     # Confirms an admin user.
     def admin_user
-      redirect_to(root_url) unless current_user.admin?
+      redirect_to(root_url, status: :see_other) unless current_user.admin?
     end
 end