floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pm_project_develop

Browse Source
This commit is contained in:
xxq250
2024-03-15 17:08:15 +08:00
parent d96a33fca4 b051213278
commit cc66f99d64
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/api/v1/projects/branches/delete_service.rb
View File

@@ -32,7 +32,7 @@ class Api::V1::Projects::Branches::DeleteService < ApplicationService
def excute_data_to_gitea
begin
@gitea_data = $gitea_client.delete_repos_branches_by_owner_repo_branch(owner, repo, branch_name, {query: request_params})
@gitea_data = $gitea_client.delete_repos_branches_by_owner_repo_branch(owner, repo, CGI.escape(branch_name), {query: request_params})
rescue => e
raise Error, '保护分支无法删除！' if e.to_s.include?("branch protected")
raise Error, '删除分支失败！'

2
app/services/api/v1/projects/tags/delete_service.rb
View File

@@ -32,7 +32,7 @@ class Api::V1::Projects::Tags::DeleteService < ApplicationService
def excute_data_to_gitea
begin
@gitea_data = $gitea_client.delete_repos_tags_by_owner_repo_tag(owner, repo, tag_name, {query: request_params})
@gitea_data = $gitea_client.delete_repos_tags_by_owner_repo_tag(owner, repo, CGI.escape(tag_name), {query: request_params})
rescue => e
raise Error, '请先删除发行版！' if e.to_s.include?("409")
raise Error, '删除标签失败！'