summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-05-31 02:25:38 +0900
committerHomu <homu@barosl.com>2016-05-31 02:25:38 +0900
commitcacccfb05541ee4da9254b864b95d6dc7804593e (patch)
tree873fcbdbcf65ab5ee5d01da3f844830767a7b55e
parent767323ac8b65a635106210b0c9cdb68b297c47b5 (diff)
parentbc87ce58fb509fa5f0dd766baf8a46a127e5d997 (diff)
downloadbundler-cacccfb05541ee4da9254b864b95d6dc7804593e.tar.gz
Auto merge of #4626 - RochesterinNYC:update-feature-requests-reporting-mechanisms, r=segiddins
[Documentation] Update docs with feature request process change
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--DEVELOPMENT.md12
2 files changed, 6 insertions, 8 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 49586ea8ce..8349280ddd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ If you're having a problem, please see [ISSUES](https://github.com/bundler/bundl
# Requesting Features
-Head on over to the [Bundler features](https://github.com/bundler/bundler-features) project, or any of the lists or channels listed below. Feature-wise, we consider Bundler stable, so the core team does not tend to work on feature suggestions. Pull requests are welcome though!
+Feel free to discuss your ideas or feature requests on any of the lists or channels listed below or [create an issue](https://github.com/bundler/bundler/issues/new) with the `feature-request` label. Feature-wise, we consider Bundler stable, so the core team does not tend to work on feature suggestions. Pull requests are welcome though!
# Discussing Bundler
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 994ed95f21..8676904244 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -8,12 +8,11 @@ You can start learning about Bundler by reading [the documentation](http://bundl
If you’re interested in contributing to Bundler, that’s awesome! We’d love your help.
-If you have any questions after reading this page, please feel free to contact either [@indirect](http://github.com/indirect) or [@hone](http://github.com/hone). They are both happy to provide help working through your first bugfix or thinking through the problem you’re trying to resolve.
+If you have any questions after reading this page, please feel free to contact either [@indirect](https://github.com/indirect), [@segiddins](https://github.com/segiddins), or [@RochesterinNYC](https://github.com/RochesterinNYC). They are all happy to provide help working through your first bug fix or thinking through the problem you’re trying to resolve.
## How you can help
-We track [small
-bugs and features](https://github.com/bundler/bundler/issues?labels=small) so that anyone who wants to help can start with something that's not too overwhelming. We also keep a [list of things anyone can help with, any time](https://github.com/bundler/bundler/blob/master/CONTRIBUTING.md#contributing). If nothing on those lists looks good, talk to us, and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
+We track [small bugs and features](https://github.com/bundler/bundler/issues?labels=small) so that anyone who wants to help can start with something that's not too overwhelming. We also keep a [list of things anyone can help with, any time](https://github.com/bundler/bundler/blob/master/CONTRIBUTING.md#contributing). If nothing on those lists looks good, talk to us, and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
# Development setup
@@ -99,15 +98,14 @@ If you can reproduce an issue, you're well on your way to fixing it. :) Fixing i
Finally, the ticket may be a duplicate of another older ticket. If you notice a ticket is a duplicate, simply comment on the ticket noting the original ticket’s number. For example, you could say “This is a duplicate of issue #42, and can be closed”.
-# Adding new features
+# Adding New Features
If you would like to add a new feature to Bundler, please follow these steps:
- 1. [Create an issue](https://github.com/bundler/bundler-features/issues/new) in the bundler-features repo to discuss your feature.
+ 1. [Create an issue](https://github.com/bundler/bundler/issues/new) with the [`feature-request` label](https://github.com/bundler/bundler/labels/feature-request) to discuss your feature.
2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) and don't add new features to old releases.
3. Commit the code and at least one test covering your changes to a feature branch in your fork.
- 4. Put a line in the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
- 5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.
+ 4. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.
If you don't hear back immediately, don’t get discouraged! We all have day jobs, but we respond to most tickets within a day or two.