summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2016-09-01 22:01:02 -0500
committerClement Ho <ClemMakesApps@gmail.com>2016-09-01 22:01:02 -0500
commite7f7df619d8ab4a3ccef830e397b931eb2143f7d (patch)
tree1666a33a5f1b2827c5f8104eff3bc31ca51f264e
parent33a367e828c95ba7321d33361be67c68b1603bdd (diff)
downloadgitlab-ce-e7f7df619d8ab4a3ccef830e397b931eb2143f7d.tar.gz
Rename behaviour to behavior in bug issue template for consistency
-rw-r--r--.gitlab/issue_templates/Bug.md2
-rw-r--r--CHANGELOG1
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 934dabe743a..27eb0c07130 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,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)