summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@dosire.com>2013-03-02 23:38:48 +0100
committerSytse Sijbrandij <sytse@dosire.com>2013-03-02 23:38:48 +0100
commit5421f6b239fcf2742e6190ee6ffdaa6144ab800a (patch)
treeb0aecbb473e48844d6961237c1b11df4877fd194 /CONTRIBUTING.md
parent56d1cc5be50939089c011325b18dee3a295edf4c (diff)
downloadgitlab-ce-5421f6b239fcf2742e6190ee6ffdaa6144ab800a.tar.gz
Small fixes and better quoting.
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ca89dbbe20..cff5e939f11 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ Feature suggestions don't belong in issues but can go to [Feedback forum](http:/
## Pull requests
-Code speaks louder than words. If you can please submit a pull request with the fix including tests. The workflow to make a pull request is a follows:
+Code speaks louder than words. If you can please submit a pull request with the fix including tests. The workflow to make a pull request is as follows:
1. Fork the project on GitHub
1. Create a feature branch
@@ -41,15 +41,15 @@ Code speaks louder than words. If you can please submit a pull request with the
We will accept pull requests if:
* The code has proper tests and all tests pass
-* It can be merged without problems (if not please use: git rebase master to fix this)
-* It won't break any existing functionality
+* It can be merged without problems (if not please use: git rebase master)
+* It doesn't break any existing functionality
* It's quality code that conforms to the [Rails style guide](https://github.com/bbatsov/rails-style-guide) and best practices
-* You describe your PR properly please give a motive for your change and the method you used to achieve it
+* The description includes a motive for your change and the method you used to achieve it
* It keeps the GitLab code base clean and well structured
-* We think other users need the same functionality
-* If it makes changes to the UI it should have screen shots
+* We think other users will need the same functionality
+* If it makes changes to the UI the pull request should include screenshots
-For examples of feedback on pull requests please look at our already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
+For examples of feedback on pull requests please look at already [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
## Submitting via GitHub's issue tracker