diff options
| author | zeripath <art27@cantab.net> | 2020-03-26 19:14:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 19:14:51 +0000 |
| commit | 52cfd2743c0e85b36081cf80a850e6a5901f1865 (patch) | |
| tree | 9b13df2465992cf00fdeb375dd04bd7c17c09f65 /templates | |
| parent | b1c331c84596f73aeab60178daf92f3539e026b9 (diff) | |
| download | gitea-52cfd2743c0e85b36081cf80a850e6a5901f1865.tar.gz gitea-52cfd2743c0e85b36081cf80a850e6a5901f1865.zip | |
Option to set default branch at repository creation (#10803)
* Option to set default branch at repository creation
* Handle template repos with non-default master branch
* Add DefaultBranch handling on creation to API
Fix #9542
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/create.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/empty.tmpl | 4 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index b63af09cec..bd97f9de1e 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -162,6 +162,10 @@ <label>{{.i18n.Tr "repo.auto_init"}}</label> </div> </div> + <div class="inline field"> + <label for="default_branch">{{.i18n.Tr "repo.default_branch"}}</label> + <input id="default_branch" name="default_branch" value="{{.default_branch}}" placeholder="master"> + </div> </div> <br/> diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index d6965d6fb9..8efb6d2866 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -52,7 +52,7 @@ git init git add README.md git commit -m "first commit" git remote add origin <span class="clone-url">{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}</span> -git push -u origin master</code></pre> +git push -u origin {{if ne .Repository.DefaultBranch "master"}}master:{{.Repository.DefaultBranch}}{{else}}master{{end}}</code></pre> </div> </div> <div class="ui divider"></div> @@ -61,7 +61,7 @@ git push -u origin master</code></pre> <h3>{{.i18n.Tr "repo.push_exist_repo"}}</h3> <div class="markdown"> <pre><code>git remote add origin <span class="clone-url">{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}</span> -git push -u origin master</code></pre> +git push -u origin {{.Repository.DefaultBranch}}</code></pre> </div> </div> {{end}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 07d760212e..2da0af95b9 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -10600,6 +10600,11 @@ "type": "boolean", "x-go-name": "AutoInit" }, + "default_branch": { + "description": "DefaultBranch of the repository (used when initializes and in template)", + "type": "string", + "x-go-name": "DefaultBranch" + }, "description": { "description": "Description of the repository to create", "type": "string", |