Merge remote-tracking branch 'upstream/pull/5357'

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

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d45dce66a8e00f6f413831d767436b8b537524e2..085d1bfea055091af3a074b552713edea291980c 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -16,8 +16,6 @@ class AccountsController < ApplicationController
   allow_social_login :only => [:edit, :update]
 
   def edit
-    @tokens = current_user.oauth_tokens.authorized
-
     if errors = session.delete(:user_errors)
       errors.each do |attribute, error|
         current_user.errors.add(attribute, error)
@@ -27,8 +25,6 @@ class AccountsController < ApplicationController
   end
 
   def update
-    @tokens = current_user.oauth_tokens.authorized
-
     user_params = params.require(:user).permit(:display_name, :new_email, :pass_crypt, :pass_crypt_confirmation, :auth_provider)
 
     if params[:user][:auth_provider].blank? ||