From ee630954d5059b5a970ab395026b344053a131b4 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 30 Mar 2019 21:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 8f3a2b53..61ea8dc9 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1125,8 +1125,8 @@ class AccountController < ApplicationController
 
   def bind_email_or_phone
     @user = User.current
-    begin
-      ActiveRecord::Base.transaction do
+    #begin
+      #ActiveRecord::Base.transaction do
         if params[:type] == "phone"
           @user.update_attributes!(:phone => params[:value])
           reward_grade(@user, @user.id, 'Phone', 500)
@@ -1135,10 +1135,10 @@ class AccountController < ApplicationController
           Gitlab.client.edit_user_email(@user.gid, :email => @user.mail) if @user.gid
           reward_grade(@user, @user.id, 'Mail', 500)
         end
-      end
-    rescue
-      raise ActiveRecord::Rollback
-    end
+      #end
+    #rescue
+    #  raise ActiveRecord::Rollback
+    #end
     redirect_to my_account_path
   end