diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-12-07 20:46:06 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-12-07 20:46:06 +0000 |
| commit | 10e8a5ea627cd1092b3c499fb47e80c8653ccd1c (patch) | |
| tree | 1e4093d1aba5830a57fad10aeaa808d417521210 | |
| parent | 4824c0ff10681126845931dc5efa01c734e1d853 (diff) | |
| parent | ef14bf17530bdad11ac4b30cd3c7d21bc703671b (diff) | |
| download | gitlab-ce-10e8a5ea627cd1092b3c499fb47e80c8653ccd1c.tar.gz | |
Merge branch 'use-us-english' into 'master'
Add documentation about using US-English
Closes #40675
See merge request gitlab-org/gitlab-ce!15656
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4930b541ba2..01d4a546b97 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -598,6 +598,7 @@ merge request: present time and never use past tense (has been/was). For example instead of _prohibited this user from being saved due to the following errors:_ the text should be _sorry, we could not create your account because:_ +1. Code should be written in [US English][us-english] This is also the style used by linting tools such as [RuboCop](https://github.com/bbatsov/rubocop), @@ -663,6 +664,7 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [GitLab Inc engineering workflow]: https://about.gitlab.com/handbook/engineering/workflow/#labelling-issues [polling-etag]: https://docs.gitlab.com/ce/development/polling.html [testing]: doc/development/testing_guide/index.md +[us-english]: https://en.wikipedia.org/wiki/American_English [^1]: Please note that specs other than JavaScript specs are considered backend code. |