diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 |
3 files changed, 2 insertions, 9 deletions
@@ -8,10 +8,9 @@ else gem "arel", '~> 2.1.0' end -gem "rack", :git => "git://github.com/rack/rack.git" gem "rack-test", :git => "git://github.com/brynary/rack-test.git" - gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git" + gem "coffee-script" gem "sass" gem "uglifier" diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index d85f077e0f..2385ac611f 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency('rack-cache', '~> 1.0.0') s.add_dependency('builder', '~> 3.0.0') s.add_dependency('i18n', '~> 0.6.0beta1') - s.add_dependency('rack', '~> 1.3.0') + s.add_dependency('rack', '~> 1.3.0.beta') s.add_dependency('rack-test', '~> 0.5.7') s.add_dependency('rack-mount', '~> 0.7.2') s.add_dependency('sprockets', '~> 2.0.0.beta.2') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 689ef921e1..b5110fa9b7 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -130,14 +130,10 @@ module Rails if options.dev? <<-GEMFILE.strip_heredoc gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' - gem 'arel', :git => 'git://github.com/rails/arel.git' - gem 'rack', :git => 'git://github.com/rack/rack.git' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc gem 'rails', :git => 'git://github.com/rails/rails.git' - gem 'arel', :git => 'git://github.com/rails/arel.git' - gem 'rack', :git => 'git://github.com/rack/rack.git' GEMFILE else <<-GEMFILE.strip_heredoc @@ -145,8 +141,6 @@ module Rails # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' - # gem 'arel', :git => 'git://github.com/rails/arel.git' - # gem 'rack', :git => 'git://github.com/rack/rack.git' GEMFILE end end |