Merge branch 'dev_trustie' into dev_chain

2020-07-02 15:00:43 +08:00 · 2020-07-02 15:00:43 +08:00 · 2e3438d75b
parent d5849976a3 7e99c0fc88
commit 2e3438d75b
2 changed files with 1 additions and 2 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -386,7 +386,6 @@ class ApplicationController < ActionController::Base
 		else
 			User.current
 		end
-		# User.current
 	end

 	## 默认输出json
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -97,7 +97,7 @@ class RepositoriesController < ApplicationController
  end

  def sync_mirror
-    return render_error("正在镜像中..") if  @repo.mirror.warning?
+    return render_error("正在镜像中..") if  @repo.mirror.waiting?

    @repo.sync_mirror!
    SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)