Browse Source

Merge branch 'develop' into standalone_develop

pull/347/head
yystopf 2 years ago
parent
commit
b051213278
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/services/api/v1/projects/branches/delete_service.rb
  2. +1
    -1
      app/services/api/v1/projects/tags/delete_service.rb

+ 1
- 1
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, '删除分支失败!'


+ 1
- 1
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, '删除标签失败!'


Loading…
Cancel
Save