Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to initialize repository with labels #6061

Merged
merged 26 commits into from
Sep 8, 2019
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4eb5f80
Add optional label sets on repo creation
jolheiser Feb 13, 2019
1a63e8e
Fix CRLF
jolheiser Feb 13, 2019
f6fd5e7
Instead of hardcoding default, make it the helper
jolheiser Feb 13, 2019
af31369
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Feb 15, 2019
4a4260f
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Feb 16, 2019
07f3fc9
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Feb 18, 2019
6d7b843
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Feb 18, 2019
d653f09
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Feb 21, 2019
f63441e
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 5, 2019
6136def
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 6, 2019
75b1b8d
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 7, 2019
49912fc
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 8, 2019
d5c5041
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 8, 2019
32ac6d8
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 14, 2019
df736bd
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Mar 18, 2019
2727d23
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser May 2, 2019
92920d1
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser May 23, 2019
86f1da0
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser May 24, 2019
95b9688
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Jun 4, 2019
cf8eb1a
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Jul 8, 2019
7c1a070
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Sep 6, 2019
74a9acb
Move label set init out of repo init
jolheiser Sep 6, 2019
3fbb5a5
Add issue labels to Swagger for repo creation
jolheiser Sep 6, 2019
ef6d26d
Update models/issue_label.go
jolheiser Sep 6, 2019
b004759
Update models/issue_label.go
jolheiser Sep 8, 2019
d943422
Merge branch 'master' into 6055_labels_on_repo_create
jolheiser Sep 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ type CreateRepoOptions struct {
Description string
OriginalURL string
Gitignores string
IssueLabels string
License string
Readme string
IsPrivate bool
Expand Down Expand Up @@ -1177,6 +1178,30 @@ func prepareRepoCommit(e Engine, repo *Repository, tmpDir, repoPath string, opts
}
}

// Issue Labels
jolheiser marked this conversation as resolved.
Show resolved Hide resolved
if len(opts.IssueLabels) > 0 {
list, err := GetLabelTemplateFile(opts.IssueLabels)
if err != nil {
return fmt.Errorf("GetLabelTemplateFile: %v", err)
}

labels := make([]*Label, len(list))
for i := 0; i < len(list); i++ {
labels[i] = &Label{
RepoID: repo.ID,
Name: list[i][0],
Description: list[i][2],
Color: list[i][1],
}
}
for _, label := range labels {
if err = newLabel(e, label); err != nil {
return fmt.Errorf("newLabel: %v", err)
}
}

}

// LICENSE
if len(opts.License) > 0 {
data, err = getRepoInitFile("license", opts.License)
Expand Down
1 change: 1 addition & 0 deletions modules/auth/repo_form.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type CreateRepoForm struct {
Description string `binding:"MaxSize(255)"`
AutoInit bool
Gitignores string
IssueLabels string
License string
Readme string
}
Expand Down
4 changes: 3 additions & 1 deletion options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -572,11 +572,13 @@ fork_visibility_helper = The visibility of a forked repository cannot be changed
repo_desc = Description
repo_lang = Language
repo_gitignore_helper = Select .gitignore templates.
issue_labels = Issue Labels
issue_labels_helper = Select an issue label set.
license = License
license_helper = Select a license file.
readme = README
readme_helper = Select a README file template.
auto_init = Initialize Repository (Adds .gitignore, License and README)
auto_init = Initialize Repository (Adds .gitignore, Issue Labels, License and README)
create_repo = Create Repository
default_branch = Default Branch
mirror_prune = Prune
Expand Down
3 changes: 3 additions & 0 deletions routers/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ func Create(ctx *context.Context) {

// Give default value for template to render.
ctx.Data["Gitignores"] = models.Gitignores
ctx.Data["LabelTemplates"] = models.LabelTemplates
ctx.Data["Licenses"] = models.Licenses
ctx.Data["Readmes"] = models.Readmes
ctx.Data["readme"] = "Default"
Expand Down Expand Up @@ -154,6 +155,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
ctx.Data["Title"] = ctx.Tr("new_repo")

ctx.Data["Gitignores"] = models.Gitignores
ctx.Data["LabelTemplates"] = models.LabelTemplates
ctx.Data["Licenses"] = models.Licenses
ctx.Data["Readmes"] = models.Readmes

Expand All @@ -172,6 +174,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
Name: form.RepoName,
Description: form.Description,
Gitignores: form.Gitignores,
IssueLabels: form.IssueLabels,
License: form.License,
Readme: form.Readme,
IsPrivate: form.Private || setting.Repository.ForcePrivate,
Expand Down
13 changes: 13 additions & 0 deletions templates/repo/create.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@
</div>
</div>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.issue_labels"}}</label>
<div class="ui search normal selection dropdown">
<input type="hidden" name="issue_labels" value="{{.issueLabels}}">
<div class="default text">{{.i18n.Tr "repo.issue_labels_helper"}}</div>
<div class="menu">
<div class="item" data-value="">{{.i18n.Tr "repo.issue_labels_helper"}}</div>
{{range .LabelTemplates}}
<div class="item" data-value="{{.}}">{{.}}</div>
{{end}}
</div>
</div>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.license"}}</label>
<div class="ui search selection dropdown">
Expand Down