diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-05 18:41:15 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-05 18:41:15 -0800 |
| commit | cbb0b2f6f379df85959e95dce1e7b359197489c7 (patch) | |
| tree | ddf377dbb8623e1c6264e6f84e7a673fc4afa422 /railties/lib/generators/rails/app | |
| parent | 0ce9c80c0a3a7d09ffd61f8b09093afbb6239c14 (diff) | |
| download | rails-cbb0b2f6f379df85959e95dce1e7b359197489c7.tar.gz rails-cbb0b2f6f379df85959e95dce1e7b359197489c7.tar.bz2 rails-cbb0b2f6f379df85959e95dce1e7b359197489c7.zip | |
Simplify conditions for --dev and --edge
Diffstat (limited to 'railties/lib/generators/rails/app')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/Gemfile | 12 |
1 files changed, 6 insertions, 6 deletions
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] -%> |