diff --git a/README.md b/README.md index 10ac15e8b..7354ec82d 100644 --- a/README.md +++ b/README.md @@ -676,6 +676,7 @@ http://localhost:3000/api/projects/3263.json | jq |description |否|string |项目描述 | |project_category_id|否|int |项目类别id | |project_language_id|否|int |项目语言id | +|default_branch |否|string |默认分支名称 | |private |否|boolean|项目是否私有, true:为私有,false: 公开,默认为公开 | diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4e13539c3..4a5889fa1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -71,9 +71,13 @@ class ProjectsController < ApplicationController ActiveRecord::Base.transaction do # Projects::CreateForm.new(project_params).validate! private = params[:private] + gitea_params = { + private: private, + default_branch: params[:default_branch] + } if [true, false].include? private new_project_params = project_params.merge(is_public: !private) - Gitea::Repository::UpdateService.new(@project.owner, @project.repository.identifier, {private: private}).call + Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params) @project.repository.update_column(:hidden, private) end @project.update_attributes!(new_project_params) diff --git a/app/services/gitea/repository/update_service.rb b/app/services/gitea/repository/update_service.rb index 37903ec9b..0d27922b8 100644 --- a/app/services/gitea/repository/update_service.rb +++ b/app/services/gitea/repository/update_service.rb @@ -28,6 +28,6 @@ class Gitea::Repository::UpdateService < Gitea::ClientService end def data_params - Hash.new.merge(token: user.gitea_token, data: params) + Hash.new.merge(token: user.gitea_token, data: params).compact end end