merge from develop

This commit is contained in:
2024-03-01 16:58:29 +08:00
6 changed files with 15 additions and 8 deletions

View File

@@ -347,7 +347,7 @@ class ProjectsController < ApplicationController
def project_params
params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
:project_category_id, :project_language_id, :license_id, :ignore_id, :private,
:project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init,
:blockchain, :blockchain_token_all, :blockchain_init_token, :pr_view_admin)
end

View File

@@ -66,8 +66,9 @@ class RepositoriesController < ApplicationController
@entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
@entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
@path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
@repo_detail = $gitea_client.get_repos_by_owner_repo(@owner.login, @project.identifier)
return render_not_found if @entries.blank? && !@repo_detail["empty"]
end
return render_not_found if @entries.blank?
end
def top_counts