aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-21 11:27:51 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-21 11:27:51 -0700
commit8059b82cbf141867cfb3a0a0fc6f1cc7ecdae1e7 (patch)
tree757ea03a45b27ff94670eb525cd1f4c76230d0b1 /railties
parent676ee7887e3689257811c8b00bd699f89a838910 (diff)
parent1f74315f85a9816b49ae4adafe29bc8750c550a6 (diff)
downloadrails-8059b82cbf141867cfb3a0a0fc6f1cc7ecdae1e7.tar.gz
rails-8059b82cbf141867cfb3a0a0fc6f1cc7ecdae1e7.tar.bz2
rails-8059b82cbf141867cfb3a0a0fc6f1cc7ecdae1e7.zip
Merge pull request #8006 from GRoguelon/master
Remove extra line in Gemfile generated
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 30f8a5f75e..5b7a653a09 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -7,7 +7,7 @@ source 'https://rubygems.org'
<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
<%= assets_gemfile_entry %>
-<%= javascript_gemfile_entry %>
+<%= javascript_gemfile_entry -%>
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'