diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-07-03 15:30:36 +0200 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-07-03 15:30:36 +0200 |
| commit | e4a310113a3a5784be863151e5bcecacb23aa244 (patch) | |
| tree | 79f9019b2e001a192eae3569b5746ba9c4ec9476 /.gitlab | |
| parent | d505b48806c0880ac810374973c4b9ba802c26e8 (diff) | |
| parent | c489d53b2e2eecb22f8dc7034da142221220e89f (diff) | |
| download | gitlab-ce-e4a310113a3a5784be863151e5bcecacb23aa244.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case
# Conflicts:
# .gitlab/issue_templates/Feature proposal.md
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Feature proposal.md | 10 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Research proposal.md (renamed from .gitlab/issue_templates/Research Proposal.md) | 0 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md (renamed from .gitlab/issue_templates/Security Developer Workflow.md) | 1 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Database changes.md (renamed from .gitlab/merge_request_templates/Database Changes.md) | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/.gitlab/issue_templates/Feature proposal.md b/.gitlab/issue_templates/Feature proposal.md index 91c68c4a9a3..c4065d3c4ea 100644 --- a/.gitlab/issue_templates/Feature proposal.md +++ b/.gitlab/issue_templates/Feature proposal.md @@ -1,10 +1,14 @@ -### Description +### Problem to solve -(Include problem, use cases, benefits, and/or goals) +### Further details + +(Include use cases, benefits, and/or goals) ### Proposal -(Proposal) +### What does success look like, and how can we measure that? + +(If no way to measure success, link to an issue that will implement a way to measure this) ### Links / references diff --git a/.gitlab/issue_templates/Research Proposal.md b/.gitlab/issue_templates/Research proposal.md index 5676656793d..5676656793d 100644 --- a/.gitlab/issue_templates/Research Proposal.md +++ b/.gitlab/issue_templates/Research proposal.md diff --git a/.gitlab/issue_templates/Security Developer Workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 0c878dbf64c..c1f702e9385 100644 --- a/.gitlab/issue_templates/Security Developer Workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -39,6 +39,7 @@ Set the title to: `[Security] Description of the original issue` - [ ] Add the nickname of the external user who found the issue (and/or HackerOne profile) to the Thanks row in the [details section](#details) ### Summary + #### Links | Description | Link | diff --git a/.gitlab/merge_request_templates/Database Changes.md b/.gitlab/merge_request_templates/Database changes.md index 1c4f30d9320..d14d52e1b6b 100644 --- a/.gitlab/merge_request_templates/Database Changes.md +++ b/.gitlab/merge_request_templates/Database changes.md @@ -1,7 +1,7 @@ Add a description of your merge request here. Merge requests without an adequate description will not be reviewed until one is added. -## Database Checklist +## Database checklist When adding migrations: @@ -31,7 +31,7 @@ When removing columns, tables, indexes or other structures: - [ ] Removed these in a post-deployment migration - [ ] Made sure the application no longer uses (or ignores) these structures -## General Checklist +## General checklist - [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary - [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html) |