Skip to content

Commit

Permalink
Relax bundler dep until 1.3.0 is actually released.
Browse files Browse the repository at this point in the history
Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'"

This reverts commit e00b8ec.

Revert "Use bundler --pre for travis builds"

This reverts commit 4d240ec.
  • Loading branch information
jeremy committed Jan 10, 2013
1 parent 3bfd99d commit 5be6fa5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
script: 'ci/travis.rb'
before_install:
- gem install bundler --pre
- gem install bundler
rvm:
- 1.9.3
- 2.0.0
Expand Down
2 changes: 1 addition & 1 deletion rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Gem::Specification.new do |s|
s.add_dependency 'actionmailer', 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'
end

0 comments on commit 5be6fa5

Please sign in to comment.