diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-11-16 18:26:39 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-11-16 18:26:39 -0200 |
commit | 788d7bce3dc60fde5588df70b5131716b99680a1 (patch) | |
tree | d9cf2d94252b2fcf60fc40d8a4ebcf77583d4e6f | |
parent | b58c37e051d7a77368a440f7f5351da04dee2336 (diff) | |
download | rails-788d7bce3dc60fde5588df70b5131716b99680a1.tar.gz rails-788d7bce3dc60fde5588df70b5131716b99680a1.tar.bz2 rails-788d7bce3dc60fde5588df70b5131716b99680a1.zip |
Using released concurrent-ruby
-rw-r--r-- | Gemfile.lock | 4 | ||||
-rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0f5a48e524..fdd4946c4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,7 +137,7 @@ PATH activesupport (= 5.0.0.alpha) arel (= 7.0.0.alpha) activesupport (5.0.0.alpha) - concurrent-ruby (~> 1.0.0.pre5, < 2.0.0) + concurrent-ruby (~> 1.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) method_source @@ -201,7 +201,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - concurrent-ruby (1.0.0.pre5) + concurrent-ruby (1.0.0) connection_pool (2.2.0) dalli (2.7.4) dante (0.2.0) diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 404c16b29f..32e28c0212 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.add_dependency 'json', '~> 1.7', '>= 1.7.7' s.add_dependency 'tzinfo', '~> 1.1' s.add_dependency 'minitest', '~> 5.1' - s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre5', '< 2.0.0' + s.add_dependency 'concurrent-ruby', '~> 1.0' s.add_dependency 'method_source' end |