From cbb0b2f6f379df85959e95dce1e7b359197489c7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Feb 2010 18:41:15 -0800 Subject: Simplify conditions for --dev and --edge --- railties/lib/generators/rails/app/templates/Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'railties/lib/generators/rails/app/templates/Gemfile') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 54aa53a181..2cc257fbd8 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/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] -%> -- cgit v1.2.3