floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-07-13 21:44:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_chain

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-07-02 15:00:43 +08:00
parent d5849976a3 7e99c0fc88
commit 2e3438d75b
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/application_controller.rb
-1
View File
@@ -386,7 +386,6 @@ class ApplicationController < ActionController::Base
else else
User.current User.current
end end
# User.current
end end
## 默认输出json ## 默认输出json
app/controllers/repositories_controller.rb
+1 -1
View File
@@ -97,7 +97,7 @@ class RepositoriesController < ApplicationController
end end
def sync_mirror def sync_mirror
return render_error("正在镜像中..") if @repo.mirror.warning? return render_error("正在镜像中..") if @repo.mirror.waiting?
@repo.sync_mirror! @repo.sync_mirror!
SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id) SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)