diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:29:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:29:33 +0000 |
| commit | 8ac9e7f8460c4c46b8e3363efda679c6d62be59b (patch) | |
| tree | bcc32c88da9db499b25fdcaf32322df3458260f7 | |
| parent | 364fbf2adadd24349ab83b5b172ada1512464665 (diff) | |
| parent | e7f7df619d8ab4a3ccef830e397b931eb2143f7d (diff) | |
| download | gitlab-ce-8ac9e7f8460c4c46b8e3363efda679c6d62be59b.tar.gz | |
Merge branch 'fix-bug-template' into 'master'
Rename behaviour to behavior in bug issue template for consistency
## What does this MR do?
Rename `behaviour` to` behavior` in bug issue template for consistency
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Consistency :thumbsup_tone1:
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #21789
See merge request !6166
| -rw-r--r-- | .gitlab/issue_templates/Bug.md | 2 | ||||
| -rw-r--r-- | CHANGELOG | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index b676916fdf4..ac38f0c9521 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -10,7 +10,7 @@ (What you should see instead) -### Actual behaviour +### Actual behavior (What actually happens) diff --git a/CHANGELOG b/CHANGELOG index 3deb6d77ec3..4237be33ac0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.12.0 (unreleased) - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling) - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps) - Center build stage columns in pipeline overview (ClemMakesApps) + - Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps) - Shorten task status phrase (ClemMakesApps) - Add hover color to emoji icon (ClemMakesApps) - Fix branches page dropdown sort alignment (ClemMakesApps) |