1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Relax bundler dep until 1.3.0 is actually released.

Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'"

This reverts commit e00b8ecf1a.

Revert "Use bundler --pre for travis builds"

This reverts commit 4d240ec20a.
This commit is contained in:
Jeremy Kemper 2013-01-10 12:34:03 -07:00
parent 3bfd99defb
commit 5be6fa5c33
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
script: 'ci/travis.rb' script: 'ci/travis.rb'
before_install: before_install:
- gem install bundler --pre - gem install bundler
rvm: rvm:
- 1.9.3 - 1.9.3
- 2.0.0 - 2.0.0

View file

@ -26,6 +26,6 @@ Gem::Specification.new do |s|
s.add_dependency 'actionmailer', version s.add_dependency 'actionmailer', version
s.add_dependency 'railties', version s.add_dependency 'railties', version
s.add_dependency 'bundler', '>= 1.3.0.pre.4', '< 2.0' s.add_dependency 'bundler', '>= 1.2.2', '< 2.0'
s.add_dependency 'sprockets-rails', '~> 2.0.0.rc1' s.add_dependency 'sprockets-rails', '~> 2.0.0.rc1'
end end