diff options
author | José Valim <jose.valim@gmail.com> | 2009-12-29 11:52:06 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-12-29 23:58:34 +0100 |
commit | 1a4d909c6845c091a04e2533ab89502de4130c1b (patch) | |
tree | 4022fad3a8d6a34aa0c6b3565b440caafb5be04e /railties/lib/rails/generators/rails/app/templates/Gemfile | |
parent | 66604b2e0e8d3aba25cab673c7a3d7831a68490c (diff) | |
download | rails-1a4d909c6845c091a04e2533ab89502de4130c1b.tar.gz rails-1a4d909c6845c091a04e2533ab89502de4130c1b.tar.bz2 rails-1a4d909c6845c091a04e2533ab89502de4130c1b.zip |
Add rails app --edge and rails app --dev
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/Gemfile')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 8e851a64e7..59c6d333e2 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -1,9 +1,14 @@ # Edit this Gemfile to bundle your application's dependencies. - +<% if !dev_or_edge? %> gem "rails", "<%= Rails::VERSION::STRING %>" +<% end -%> ## Bundle edge rails: -# gem "rails", :git => "git://github.com/rails/rails.git" +<%- if options.dev? -%> +gem "rails", :path => "<%= Rails::Generators::RAILS_DEV_PATH %>" +<%- else -%> +<%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" +<%- end -%> ## Bundle the gems you use: # gem "bj" |