Merge branch 'dev_educoder' of https://git.trustie.net/jasder/forgeplus into dev_educoder

app/controllers/accounts_controller.rb

@@ -11,7 +11,6 @@ class AccountsController < ApplicationController
     Users::SyncGiteaForm.new(sync_gitea_params).validate!
     user = User.find_by(login: sync_gitea_params[:login])
     return render_error("该用户已同步协作平台") if user.gitea_token.present? && user.gitea_uid.present?
-    user.mail = sync_gitea_params[:email]
     interactor = Gitea::RegisterInteractor.call({username: sync_gitea_params[:login], email: sync_gitea_params[:email], password: sync_gitea_params[:password]})
     if interactor.success?
       gitea_user = interactor.result
@@ -363,7 +362,7 @@ class AccountsController < ApplicationController
     { login: pre + code, email: email, phone: phone }
   end
 
-  def sync_gitea_params 
+  def sync_gitea_params
     params.permit(:login, :email, :password)
   end
 

app/controllers/users_controller.rb

@@ -236,13 +236,12 @@ class UsersController < ApplicationController
   # TODO: For Educoder
   def change_password
     user = User.find_by_login params[:login]
-    return render_error("用户 #{rq_params[:login]} 不存在.") unless user === current_user
+    return render_error("用户 #{params[:login]} 不存在.") unless user === current_user
 
     form_params= {
       login: params[:login],
       email: user&.mail,
       password: params[:password],
-      old_password: params[:old_password],
       user: user
     }
     Gitea::User::ChangePasswordForm.new(form_params).validate!

app/forms/gitea/user/change_password_form.rb

@@ -2,14 +2,13 @@ class Gitea::User::ChangePasswordForm
   include ActiveModel::Model
 
   attr_accessor :user
-  attr_accessor :email, :login, :old_password, :password
+  attr_accessor :email, :login, :password
 
   validates :email, presence: true, format: { with: CustomRegexp::EMAIL }
   validates :login, presence: true
-  validates :old_password, presence: true
   validates :password, presence: true
 
-  validate :check_old_password
+  # validate :check_old_password
 
   def check_old_password
      return if user.check_password?(old_password.to_s)

app/models/project.rb

@@ -52,6 +52,8 @@
 #  platform               :integer          default("0")
 #  license_id             :integer
 #  ignore_id              :integer
+#  default_branch         :string(255)      default("master")
+#  website                :string(255)
 #
 # Indexes
 #
@@ -66,7 +68,8 @@
 #  index_projects_on_rgt                     (rgt)
 #  index_projects_on_status                  (status)
 #  index_projects_on_updated_on              (updated_on)
-#
+#
+
 
 class Project < ApplicationRecord
   include Matchable