Permalink
Browse files

We no longer depend on those git repos.

  • Loading branch information...
1 parent f7c711b commit 06ddda0a5f659cab8c2c76cfcb3b27ac5bb47ea6 @josevalim josevalim committed May 3, 2011
Showing with 2 additions and 9 deletions.
  1. +1 −2 Gemfile
  2. +1 −1 actionpack/actionpack.gemspec
  3. +0 −6 railties/lib/rails/generators/app_base.rb
View
@@ -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"
@@ -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')
@@ -130,23 +130,17 @@ def rails_gemfile_entry
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
gem 'rails', '#{Rails::VERSION::STRING}'
# 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

0 comments on commit 06ddda0

Please sign in to comment.