Merge branch 'develop' into hh_develop

app/controllers/users_controller.rb

@@ -234,7 +234,7 @@ class UsersController < ApplicationController
   end
 
   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
 
     sync_params = {

app/forms/users/update_info_form.rb

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