aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-16 06:18:24 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-16 06:18:24 -0800
commit8d06b62c2f95458c5ba6ddd3bb469f5ce4111973 (patch)
tree8f84c5984600de1a1d049c0cc0a24edd2de0855a
parentde20debe64df114090c32bcfcdc9f40dc34a79d2 (diff)
parent9a07996aeded06dc662806e4c9dce7a4623af93e (diff)
downloadrails-8d06b62c2f95458c5ba6ddd3bb469f5ce4111973.tar.gz
rails-8d06b62c2f95458c5ba6ddd3bb469f5ce4111973.tar.bz2
rails-8d06b62c2f95458c5ba6ddd3bb469f5ce4111973.zip
Merge pull request #8234 from kentaro/bundler-1.2.2
Updated dependency on bundler to ~> 1.2.2
-rw-r--r--rails.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/rails.gemspec b/rails.gemspec
index c8d5e6bc65..ba94354bf1 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.2'
+ s.add_dependency 'bundler', '>= 1.2.2', '< 2.0'
s.add_dependency 'sprockets-rails', '~> 2.0.0.rc1'
end