diff options
| author | Eric Guo <eric.guo@sandisk.com> | 2015-09-13 01:06:16 +0800 |
|---|---|---|
| committer | Eric Guo <eric.guo@sandisk.com> | 2015-09-13 01:06:16 +0800 |
| commit | 3ac70bd383b9619cb7135605e429a4afc26daa58 (patch) | |
| tree | c25040ad47ef780e84c36bc0799d7a0c88fccc8c /railties/lib/rails | |
| parent | 59ec70dcbeb2fb6d1d5ef63bd807ec0e915f7b3a (diff) | |
| download | rails-3ac70bd383b9619cb7135605e429a4afc26daa58.tar.gz rails-3ac70bd383b9619cb7135605e429a4afc26daa58.tar.bz2 rails-3ac70bd383b9619cb7135605e429a4afc26daa58.zip | |
dev and edge have some common, so factor it out.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 38074e80e0..0f44f4694e 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -205,24 +205,21 @@ module Rails end def rails_gemfile_entry - if options.dev? - [ - GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH), + dev_edge_common = [ GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'), GemfileEntry.github('sprockets', 'rails/sprockets'), GemfileEntry.github('sass-rails', 'rails/sass-rails'), GemfileEntry.github('arel', 'rails/arel'), GemfileEntry.github('rack', 'rack/rack') ] + if options.dev? + [ + GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH) + ] + dev_edge_common elsif options.edge? [ - GemfileEntry.github('rails', 'rails/rails'), - GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'), - GemfileEntry.github('sprockets', 'rails/sprockets'), - GemfileEntry.github('sass-rails', 'rails/sass-rails'), - GemfileEntry.github('arel', 'rails/arel'), - GemfileEntry.github('rack', 'rack/rack') - ] + GemfileEntry.github('rails', 'rails/rails') + ] + dev_edge_common else [GemfileEntry.version('rails', Rails::VERSION::STRING, |