floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
xxq250 2024-05-13 08:54:28 +08:00
parent c5ec05ea77 7e654331db
commit 9462e14628
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/v1/projects/sync_repositories_controller.rb
View File

@ -1,5 +1,6 @@
class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController
before_action :require_public_and_member_above before_action :require_public_and_member_above, except: [:sync]
before_action :load_project, only: [:sync]
def index def index
@sync_repositories = @project.sync_repositories @sync_repositories = @project.sync_repositories
@ -29,7 +30,7 @@ class Api::V1::Projects::SyncRepositoriesController < Api::V1::BaseController
else else
@sync_repositories = SyncRepository.where(project: @project, sync_direction: params[:sync_direction]) @sync_repositories = SyncRepository.where(project: @project, sync_direction: params[:sync_direction])
end end
branch = params[:ref].split("refs/heads/")[-1] branch = params[:payload].present? ? JSON.parse(params[:payload])["ref"].split("/")[-1] : params[:ref].split("/")[-1] rescue nil
if params[:sync_direction].to_i == 1 if params[:sync_direction].to_i == 1
@sync_repository_branches = SyncRepositoryBranch.where(sync_repository_id: @sync_repositories, gitlink_branch_name: branch, enable: true) @sync_repository_branches = SyncRepositoryBranch.where(sync_repository_id: @sync_repositories, gitlink_branch_name: branch, enable: true)
else else