dev_haigong
cxt 6 years ago
parent 29001ced81
commit ee630954d5

@ -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

Loading…
Cancel
Save