floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-24 13:45:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into hh_develop

Browse Source
This commit is contained in:
vilet.yy
2021-04-02 18:41:37 +08:00
parent 1d832a1723 6ce4b26047
commit 7a00541375
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@@ -234,7 +234,7 @@ class UsersController < ApplicationController
end end
def sync_user_info def sync_user_info
user = User.find_by_mail params[:email] user = User.find_by_login params[:login]
return render_forbidden unless user === current_user return render_forbidden unless user === current_user
sync_params = { sync_params = {

3
app/forms/users/update_info_form.rb
View File

@@ -1,8 +1,9 @@
class Users::UpdateInfoForm class Users::UpdateInfoForm
include ActiveModel::Model include ActiveModel::Model
attr_accessor :email, :password attr_accessor :email, :password, :login
validates :email, presence: true, format: { with: CustomRegexp::EMAIL } validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
validates :password, presence: true validates :password, presence: true
validates :login, presence: true
end end