summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-03-20 12:08:53 +0000
committerThe Bundler Bot <bot@bundler.io>2017-03-20 12:08:53 +0000
commitdd7b0cdff64929ab00f786b2744a28eed1ef6c3f (patch)
tree5e58fa8dcb66848853050d48a1870074d3bdc35c
parent81d53b52444572cf1454da4c741242e2dd47de5c (diff)
parentdf2d62e0d4a7cd7b0ca80e705c6a7b8ca5d07067 (diff)
downloadbundler-dd7b0cdff64929ab00f786b2744a28eed1ef6c3f.tar.gz
Auto merge of #5523 - colby-swandale:newgem-readme-spacing, r=segiddins
fix spacing between paragraphs in generated READMEs for new gems This PR fixes a tiny cosmetic issue in the READMEs that are generated with the `bundle gem` command. Currently when ERB is parsing the `<% if ...` blocks the new lines are not being omitted so you end up with: ``` ## Contributing Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/testapp. 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. ## License The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT). ## Code of Conduct Everyone interacting in the Testapp project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/testapp/blob/master/CODE_OF_CONDUCT.md). ``` Where it should be: ``` ## Contributing Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/testapp. 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. ## License The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT). ## Code of Conduct Everyone interacting in the Testapp project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/testapp/blob/master/CODE_OF_CONDUCT.md). ```
-rw-r--r--lib/bundler/templates/newgem/README.md.tt8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt
index 3fbda37958..6eb270a124 100644
--- a/lib/bundler/templates/newgem/README.md.tt
+++ b/lib/bundler/templates/newgem/README.md.tt
@@ -33,15 +33,15 @@ 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 %>
-<% if config[:mit] %>
+<% if config[:mit] -%>
## License
The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-<% end %>
+<% end -%>
-<% if config[:coc] %>
+<% if config[:coc] -%>
## Code of Conduct
Everyone interacting in the <%= config[:constant_name] %> project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/master/CODE_OF_CONDUCT.md).
-<% end %>
+<% end -%>