Merge remote-tracking branch 'origin/educoder' into educoder

lib/trustie/gitlab/helper.rb

@@ -28,7 +28,7 @@ module Trustie
         begin
           u = find_user(user)
           unless u.present?
-            u = self.g.create_user("#{user.login}@educoder.com",user.hashed_password,name: user.show_name, username: user.login,confirm: "true")
+            u = self.g.create_user(user.mail, user.hashed_password, name: user.show_name, username: user.login, confirm: "true")
             Rails.logger.warn("create gitlab log ##user.mail is #{user.mail}, name is #{user.show_name}, u id is#{u.id}")
             user.gid = u.id
             user.save