Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #5137 from amiel/contributing-updates

[DOC] Update CONTRIBUTING.md for commit prefixes and feature flags
  • Loading branch information...
commit a47897efe0e8b4fd56dab051462c78ab2fe287ff 2 parents 1097767 + 43d4d5a
@rwjblue rwjblue authored
Showing with 15 additions and 3 deletions.
  1. +15 −3 CONTRIBUTING.md
View
18 CONTRIBUTING.md
@@ -80,12 +80,24 @@ to know that you have a clean slate: `npm install && npm test`.
3. Add a test for your change. Only refactoring and documentation changes
require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+a test! If your change is a new feature, please
+[wrap it in a feature flag](http://emberjs.com/guides/contributing/adding-new-features/).
4. Make the test pass.
-5. Commit your changes. If your pull request fixes an issue specify it in the commit message.
-Here's an example: `git commit -m "Close #52 – Fix controller and viewbindings"`
+5. Commit your changes. Please use an appropriate commit prefix.
+If your pull request fixes an issue specify it in the commit message. Some examples:
+
+ ```
+ [DOC beta] Update CONTRIBUTING.md for commit prefixes
+ [FEATURE query-params-new] Message
+ [BUGFIX beta] Message
+ [SECURITY CVE-111-1111] Message
+ ```
+
+ For more information about commit prefixes see
+ [Robert Jacksons slides on contributing to Ember](https://speakerdeck.com/rwjblue/contributing-to-ember).
+
6. Push to your fork and submit a pull request. Please provide us with some
explanation of why you made the changes you made. For new features make sure to
Please sign in to comment.
Something went wrong with that request. Please try again.