修复:pulls文件夹load

This commit is contained in:
yystopf 2022-07-28 15:19:31 +08:00
parent 35c6cb98db
commit d5c141f892
4 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
class Api::V1::Projects::PullsController < Api::V1::BaseController
class Api::V1::Projects::Pulls::PullsController < Api::V1::BaseController
before_action :require_public_and_member_above
def index

View File

@ -86,7 +86,7 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params} ) rescue nil
raise Error, '查询分支名称失败!' unless result.is_a?(Hash)
raise Error, '分支不存在!' unless result['branch_name'].include?(branch)
raise Error, '分支已存在!' if result['branch_name'].include?(new_branch) && new_branch.nil?
raise Error, '分支已存在!' if result['branch_name'].include?(new_branch) && !new_branch.nil?
end
end