diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-30 17:43:56 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-30 17:43:56 +0000 |
commit | 7f47dddc25d1f3fa55b0c0e9378240077b3ddf3f (patch) | |
tree | 12aac32ade232e89923a66a4398144b2aa5de8f7 /doc/development | |
parent | 4bbe5ce622eafc886c3c6732bb5e7b39d1d7a351 (diff) | |
parent | 1fc0d4f4b50a9aeae73a0b0a9a4641e57786e6b3 (diff) | |
download | gitlab-ce-7f47dddc25d1f3fa55b0c0e9378240077b3ddf3f.tar.gz |
Merge branch 'patch-1' into 'master'
Clarify blank line rule in newlines_styleguide.md
## What does this MR do?
* Corrects a typo in the GitLab Ruby newlines style guide
* Makes some vague language in the original guideline more precise
## Are there points in the code the reviewer needs to double check?
n/a
## Why was this MR needed?
* There was a typo in the original text.
* The original text was vague.
## What are the relevant issue numbers?
n/a
## Screenshots (if relevant)
n/a
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (Is this recommended for this kind of patch?)
- ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~API support added~~
- Tests
- ~~Added for this feature/bug~~
- [x] All builds are passing
- [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)
See merge request !6048
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/newlines_styleguide.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/newlines_styleguide.md b/doc/development/newlines_styleguide.md index e03adcaadea..32aac2529a4 100644 --- a/doc/development/newlines_styleguide.md +++ b/doc/development/newlines_styleguide.md @@ -2,7 +2,7 @@ This style guide recommends best practices for newlines in Ruby code. -## Rule: separate code with newlines only when it makes sense from logic perspectice +## Rule: separate code with newlines only to group together related logic ```ruby # bad |