Add config option to make create-on-push repositories public by default (#12936)

* Add config option to make create-on-push repositories public by default

* Fix linting

* Add option to 'config cheat sheet' page

* Chinese translation

Signed-off-by: a1012112796 <1012112796@qq.com>
* Fix typo in docs

* fix typo

* Add option to example config

Co-authored-by: Tait Hoyem <code@tait.tech>
Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index b3b9fd96cc708008c6eac581d70f03403747da51..e67657d0762920abf1b76d89626c0562a2b9924f 100644 (file)
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -30,6 +30,8 @@ ANSI_CHARSET =
 FORCE_PRIVATE = false
 ; Default privacy setting when creating a new repository, allowed values: last, private, public. Default is last which means the last setting used.
 DEFAULT_PRIVATE = last
+; Default private when using push-to-create
+DEFAULT_PUSH_CREATE_PRIVATE = true
 ; Global limit of repositories per user, applied at creation time. -1 means no limit
 MAX_CREATION_LIMIT = -1
 ; Mirror sync queue length, increase if mirror syncing starts hanging

diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index 673eeac79ddae4f83c9fc11e278fe6a31a088ea8..c63233fe1f3e09bb7747fb33c5024ed846888cd4 100644 (file)
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -51,6 +51,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `FORCE_PRIVATE`: **false**: Force every new repository to be private.
 - `DEFAULT_PRIVATE`: **last**: Default private when creating a new repository.
    \[last, private, public\]
+- `DEFAULT_PUSH_CREATE_PRIVATE`: **true**: Default private when creating a new repository with push-to-create.
 - `MAX_CREATION_LIMIT`: **-1**: Global maximum creation limit of repositories per user,
    `-1` means no limit.
 - `PULL_REQUEST_QUEUE_LENGTH`: **1000**: Length of pull request patch test queue, make it

diff --git a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
index ac6c94dff2f272db201ae83b155fcabf276e2434..f771f4fc8976e5b0538ab0a2196892f4ec5f82cb 100644 (file)
--- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
@@ -30,6 +30,7 @@ menu:
 - `ANSI_CHARSET`: 默认字符编码。
 - `FORCE_PRIVATE`: 强制所有git工程必须私有。
 - `DEFAULT_PRIVATE`: 默认创建的git工程为私有。 可以是`last`, `private` 或 `public`。默认值是 `last`表示用户最后创建的Repo的选择。
+- `DEFAULT_PUSH_CREATE_PRIVATE`: **true**:  通过 ``push-to-create`` 方式创建的仓库是否默认为私有仓库.
 - `MAX_CREATION_LIMIT`: 全局最大每个用户创建的git工程数目， `-1` 表示没限制。
 - `PULL_REQUEST_QUEUE_LENGTH`: 小心：合并请求测试队列的长度，尽量放大。
 

diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index b5764f7fc4a6f6dcaf732cfe2b0631ed61782fcd..5203a1bbeba68c91e8f7d4cb9a537aba5574754f 100644 (file)
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -29,6 +29,7 @@ var (
                AnsiCharset                             string
                ForcePrivate                            bool
                DefaultPrivate                          string
+               DefaultPushCreatePrivate                bool
                MaxCreationLimit                        int
                MirrorQueueLength                       int
                PullRequestQueueLength                  int
@@ -134,6 +135,7 @@ var (
                AnsiCharset:                             "",
                ForcePrivate:                            false,
                DefaultPrivate:                          RepoCreatingLastUserVisibility,
+               DefaultPushCreatePrivate:                true,
                MaxCreationLimit:                        -1,
                MirrorQueueLength:                       1000,
                PullRequestQueueLength:                  1000,

diff --git a/services/repository/repository.go b/services/repository/repository.go
index c6768f3f00f129d473fd783c0d215eefc0b9ef4d..88b16239342bf446a13942d80f6caba5984d4a1c 100644 (file)
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -11,6 +11,7 @@ import (
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/notification"
        repo_module "code.gitea.io/gitea/modules/repository"
+       cfg "code.gitea.io/gitea/modules/setting"
        pull_service "code.gitea.io/gitea/services/pull"
 )
 
@@ -88,7 +89,7 @@ func PushCreateRepo(authUser, owner *models.User, repoName string) (*models.Repo
 
        repo, err := CreateRepository(authUser, owner, models.CreateRepoOptions{
                Name:      repoName,
-               IsPrivate: true,
+               IsPrivate: cfg.Repository.DefaultPushCreatePrivate,
        })
        if err != nil {
                return nil, err