Permalink
Browse files

Simplify conditions for --dev and --edge

  • Loading branch information...
1 parent 0ce9c80 commit cbb0b2f6f379df85959e95dce1e7b359197489c7 @dhh dhh committed Feb 6, 2010
Showing with 6 additions and 6 deletions.
  1. +6 −6 railties/lib/generators/rails/app/templates/Gemfile
@@ -1,15 +1,15 @@
# Edit this Gemfile to bundle your application's dependencies.
source 'http://gemcutter.org'
-<% if !dev_or_edge? %>
-gem "rails", "<%= Rails::VERSION::STRING %>"
-<% end -%>
-
-## Bundle edge rails:
<%- if options.dev? -%>
gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>"
+<%- elsif options.edge? -%>
+gem "rails", :git => "git://github.com/rails/rails.git"
<%- else -%>
-<%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rails", "<%= Rails::VERSION::STRING %>"
+
+# Bundle edge Rails instead
+# gem "rails", :git => "git://github.com/rails/rails.git"
<%- end -%>
<% unless options[:skip_activerecord] -%>

0 comments on commit cbb0b2f

Please sign in to comment.