diff options
author | Bundlerbot <bot@bundler.io> | 2019-07-23 18:40:23 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-07-23 18:40:23 +0000 |
commit | e9c83b85622ebffecc645dcf092af8b607f46f10 (patch) | |
tree | bbf284e66a18a40878a83732986dda53d3b5827b | |
parent | 708bb7b6088cff9cb5cfd82f2424b50f8b1d49bd (diff) | |
parent | a94f74682ebd40fd552a663e42713b5dff3e95ab (diff) | |
download | bundler-e9c83b85622ebffecc645dcf092af8b607f46f10.tar.gz |
Merge #7238
7238: Point to CoC which contains the contributor covenant r=deivid-rodriguez a=ajwann
### What was the end-user problem that led to this PR?
The generated README contains two different links to contributor covenant. Since the generated Code of Conduct *contains* the text of the Contributor Covenant, we can just point the generated README to the generated CoC, and explicitly refer to it as the code of conduct.
### What is your fix for the problem, implemented in this PR?
The generated readme now points to the gems CoC (which contains the Contributor Covenant)
Closes #6905.
Co-authored-by: Adam Wanninger <ajwann@ajwann.com>
-rw-r--r-- | lib/bundler/templates/newgem/README.md.tt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt index 22ddeaa91a..b9d47cb7d8 100644 --- a/lib/bundler/templates/newgem/README.md.tt +++ b/lib/bundler/templates/newgem/README.md.tt @@ -32,7 +32,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To ## Contributing -Bug reports and pull requests are welcome on GitHub at https://github.com/<%= config[:github_username] %>/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.<% end %> +Bug reports and pull requests are welcome on GitHub at https://github.com/<%= config[:github_username] %>/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/master/CODE_OF_CONDUCT.md).<% end %> + <% if config[:mit] -%> ## License |