diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 12:34:03 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 12:37:12 -0700 |
| commit | 5be6fa5c33412a0390598b50e941c0c5d872b979 (patch) | |
| tree | 56901b008feedb018fd21ab16e7a987d7f0269dd | |
| parent | 3bfd99defb559af0b017ee920ca714aa1e367fdd (diff) | |
| download | rails-5be6fa5c33412a0390598b50e941c0c5d872b979.tar.gz rails-5be6fa5c33412a0390598b50e941c0c5d872b979.tar.bz2 rails-5be6fa5c33412a0390598b50e941c0c5d872b979.zip | |
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 e00b8ecf1ad8984b760f12e61247820613aec4ee.
Revert "Use bundler --pre for travis builds"
This reverts commit 4d240ec20a70122b7e69c790a37d2be14e1ff038.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | rails.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 257a6dc7e7..18b0100c62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ script: 'ci/travis.rb' before_install: - - gem install bundler --pre + - gem install bundler rvm: - 1.9.3 - 2.0.0 diff --git a/rails.gemspec b/rails.gemspec index 5505ac45a8..34957c9455 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -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 |