aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-01-04 16:32:43 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-01-04 16:32:43 -0800
commit952e449fc0b9adce240df6197a189d179f5e5b7f (patch)
tree8f33eab2df34ebb601a1e0f0c26ce0d7991d3463
parent17f053931ea3bbf583f197d3318eece0b5a771d6 (diff)
downloadrails-952e449fc0b9adce240df6197a189d179f5e5b7f.tar.gz
rails-952e449fc0b9adce240df6197a189d179f5e5b7f.tar.bz2
rails-952e449fc0b9adce240df6197a189d179f5e5b7f.zip
Fix --dev option
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 59c6d333e2..7b5c89c3e2 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -5,7 +5,8 @@ gem "rails", "<%= Rails::VERSION::STRING %>"
## Bundle edge rails:
<%- if options.dev? -%>
-gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>"
+directory "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec"
+gem "rails", "<%= Rails::VERSION::STRING %>"
<%- else -%>
<%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git"
<%- end -%>