mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-02 19:30:48 +08:00
Merge branch 'develop' into standalone_develop
This commit is contained in:
@@ -56,6 +56,7 @@ default: &default
|
||||
domain: 'https://testgit.trustie.net'
|
||||
base_url: '/api/v1'
|
||||
admin_token: '123123'
|
||||
hat_base_url: '/api/hat'
|
||||
accelerator:
|
||||
access_key_id: ''
|
||||
access_key_secret: ''
|
||||
|
||||
@@ -7,5 +7,14 @@ $gitea_client = Gitea::Api::Client.new({
|
||||
domain: gitea_config[:domain],
|
||||
base_url: gitea_config[:base_url],
|
||||
username: gitea_config[:access_key_id],
|
||||
password: gitea_config[:access_key_secret]
|
||||
password: gitea_config[:access_key_secret],
|
||||
log_filepath: "log/gitea-client.log"
|
||||
})
|
||||
|
||||
$gitea_hat_client = Gitea::Api::Hat::Client.new({
|
||||
domain: gitea_config[:domain],
|
||||
hat_base_url: gitea_config[:hat_base_url],
|
||||
username: gitea_config[:access_key_id],
|
||||
password: gitea_config[:access_key_secret],
|
||||
log_filepath: "log/gitea-client.log"
|
||||
})
|
||||
@@ -840,6 +840,7 @@ Rails.application.routes.draw do
|
||||
post :unlock
|
||||
post :active
|
||||
post :reset_login_times
|
||||
post :fresh_gitea_token
|
||||
end
|
||||
end
|
||||
resource :import_disciplines, only: [:create]
|
||||
|
||||
Reference in New Issue
Block a user