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

app/models/user.rb

@@ -181,7 +181,7 @@ class User < Owner
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
   scope :like, lambda { |keywords|
     sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
-    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+    where(sql, :search => "%#{keywords.strip}%") unless keywords.blank?
   }
 
   scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}
@@ -567,7 +567,8 @@ class User < Owner
     return '游客' unless logged?
     name = lastname + firstname
     name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    # name.gsub(/\s+/, '').strip    #6.11 -hs
+    name.strip
   end
 
   def only_real_name