From 284a9ba8ecbbaac598179af6fc65aed7bcf5785b Mon Sep 17 00:00:00 2001 From: Jerry D'Antonio Date: Mon, 13 Jul 2015 14:22:54 -0400 Subject: Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby. The concurrent-ruby gem is a toolset containing many concurrency utilities. Many of these utilities include runtime-specific optimizations when possible. Rather than clutter the Rails codebase with concurrency utilities separate from the core task, such tools can be superseded by similar tools in the more specialized gem. This commit replaces `ActiveSupport::Concurrency::Latch` with `Concurrent::CountDownLatch`, which is functionally equivalent. --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 960a77af92..e44a2fc2ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,7 @@ PATH actionpack (5.0.0.alpha) actionview (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) + concurrent-ruby (~> 0.9.0) rack (~> 1.6) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -85,6 +86,7 @@ PATH activesupport (= 5.0.0.alpha) arel (= 7.0.0.alpha) activesupport (5.0.0.alpha) + concurrent-ruby (~> 0.9.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -135,6 +137,7 @@ GEM execjs coffee-script-source (1.9.0) columnize (0.9.0) + concurrent-ruby (0.9.0) connection_pool (2.1.1) dalli (2.7.2) dante (0.1.5) -- cgit v1.2.3 From 9dc06bc1f3bed149012361036b6930cacd73c676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 14 Jul 2015 15:20:15 -0300 Subject: Fix Gemfile.lock --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index e44a2fc2ed..897bdeff83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,6 @@ PATH actionpack (5.0.0.alpha) actionview (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) - concurrent-ruby (~> 0.9.0) rack (~> 1.6) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) -- cgit v1.2.3 From 8e2f267f6250838cf9057d61d986d2afee2d044b Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Sat, 20 Jun 2015 12:00:35 -0700 Subject: Add method_source dependency to activesupport --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 897bdeff83..045000316a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,7 @@ PATH concurrent-ruby (~> 0.9.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) + method_source minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) -- cgit v1.2.3 From 67b07f809b4621aefe1956c2fa23646fee230ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 10 Aug 2015 00:30:03 -0300 Subject: Update Gemfile.lock --- Gemfile.lock | 101 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 53 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 897bdeff83..270e96c647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,44 +13,44 @@ GIT GIT remote: git://github.com/mikel/mail.git - revision: b159e0a542962fdd5e292a48cfffa560d7cf412e + revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce specs: mail (2.6.3.edge) mime-types (>= 1.16, < 3) GIT remote: git://github.com/rails/arel.git - revision: aac9da257f291ad8d2d4f914528881c240848bb2 + revision: d5432b4616ff43fbb14540d351eed351e21bb20e branch: master specs: arel (7.0.0.alpha) GIT remote: git://github.com/rails/globalid.git - revision: 4df66fb9e9f0c832d29119aa8bc30be55a614b71 + revision: 8178ff2dc898a8f49dd71f6eb46f2a09712462de specs: - globalid (0.3.5) + globalid (0.3.6) activesupport (>= 4.1.0) GIT remote: git://github.com/rails/jquery-rails.git - revision: 272abdd319bb3381b23182b928b25320590096b0 + revision: 38053f45402f1ccc4cce5dd8c7005ec707376db3 branch: master specs: - jquery-rails (4.0.3) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) GIT remote: git://github.com/rails/sprockets-rails.git - revision: 85b89c44ad40af3056899808475e6e4bf65c1f5a + revision: ad4a43bd1bb19c86a8bf94a2ad5e477686161490 branch: master specs: - sprockets-rails (3.0.0.beta1) + sprockets-rails (3.0.0) actionpack (>= 4.0) activesupport (>= 4.0) - sprockets (>= 3.0.0, < 4.0) + sprockets (>= 3.0.0) PATH remote: . @@ -113,74 +113,70 @@ GEM remote: https://rubygems.org/ specs: amq-protocol (1.9.2) - backburner (0.4.6) - beaneater (~> 0.3.1) - dante (~> 0.1.5) + backburner (1.0.0) + beaneater (~> 1.0) + dante (> 0.1.5) bcrypt (3.1.10) bcrypt (3.1.10-x64-mingw32) bcrypt (3.1.10-x86-mingw32) - beaneater (0.3.3) - benchmark-ips (2.1.1) + beaneater (1.0.0) + benchmark-ips (2.3.0) builder (3.2.2) bunny (1.7.0) amq-protocol (>= 1.9.2) - byebug (4.0.5) + byebug (5.0.0) columnize (= 0.9.0) - celluloid (0.16.0) + celluloid (0.16.1) timers (~> 4.0.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.0) + coffee-script-source (1.9.1.1) columnize (0.9.0) - concurrent-ruby (0.9.0) - connection_pool (2.1.1) - dalli (2.7.2) - dante (0.1.5) + concurrent-ruby (0.9.1) + connection_pool (2.2.0) + dalli (2.7.4) + dante (0.2.0) delayed_job (4.0.6) activesupport (>= 3.0, < 5.0) delayed_job_active_record (4.0.3) activerecord (>= 3.0, < 5.0) delayed_job (>= 3.0, < 4.1) erubis (2.7.0) - execjs (2.3.0) + execjs (2.5.2) hitimes (1.2.2) hitimes (1.2.2-x86-mingw32) i18n (0.7.0) - json (1.8.2) + json (1.8.3) kindlerb (0.1.1) mustache nokogiri - loofah (2.0.1) + loofah (2.0.2) nokogiri (>= 1.5.9) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.2) minitest (5.3.3) mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.0) - multi_json (1.11.0) - mustache (1.0.0) + multi_json (1.11.2) + mustache (1.0.2) mysql (2.9.1) - mysql2 (0.3.18) + mysql2 (0.3.19) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogiri (1.6.6.2-x64-mingw32) - mini_portile (~> 0.6.0) - nokogiri (1.6.6.2-x86-mingw32) - mini_portile (~> 0.6.0) - pg (0.18.1) + pg (0.18.2) psych (2.0.13) - que (0.9.2) + que (0.10.0) queue_classic (3.1.0) pg (>= 0.17, < 0.19) racc (1.4.12) - rack (1.6.0) + rack (1.6.4) rack-cache (1.2) rack (>= 0.4) rack-protection (1.5.3) @@ -199,7 +195,7 @@ GEM rdoc (4.2.0) redcarpet (3.2.3) redis (3.2.1) - redis-namespace (1.5.1) + redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) resque (1.25.2) mono_logger (~> 1.0) @@ -212,47 +208,46 @@ GEM redis (~> 3.0) resque (~> 1.25) rufus-scheduler (~> 3.0) - rufus-scheduler (3.0.9) - tzinfo + rufus-scheduler (3.1.3) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sequel (4.19.0) + sequel (4.25.0) serverengine (1.5.10) sigdump (~> 0.2.2) - sidekiq (3.3.2) - celluloid (>= 0.16.0) - connection_pool (>= 2.1.1) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) - sigdump (0.2.2) - sinatra (1.4.5) + sidekiq (3.4.2) + celluloid (~> 0.16.0) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) + sigdump (0.2.3) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) + tilt (>= 1.3, < 3) sneakers (1.0.4) bunny (~> 1.7.0) serverengine (~> 1.5.5) thor thread (~> 0.1.7) - sprockets (3.0.2) + sprockets (3.0.3) rack (~> 1.0) sqlite3 (1.3.10) stackprof (0.2.7) - sucker_punch (1.3.2) + sucker_punch (1.5.0) celluloid (~> 0.16.0) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.1) timers (4.0.1) hitimes turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) vegas (0.1.11) -- cgit v1.2.3 From 68e3279163d06e6b04e043f91c9470e9259bbbe0 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Thu, 13 Aug 2015 09:56:06 +0200 Subject: implement `provider_job_id` for `queue_classic`. The latest, currently unreleased, version of queue_classic is required for this to work. See https://github.com/QueueClassic/queue_classic/pull/262 for more details. --- Gemfile.lock | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 270e96c647..aa0f5f7b2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: git://github.com/QueueClassic/queue_classic.git + revision: d144db29f1436e9e8b3c7a1a1ecd4442316a9ecd + specs: + queue_classic (3.2.0.alpha) + pg (>= 0.17, < 0.19) + GIT remote: git://github.com/bkeepers/qu.git revision: d098e2657c92e89a6413bebd9c033930759c061f @@ -173,8 +180,6 @@ GEM pg (0.18.2) psych (2.0.13) que (0.10.0) - queue_classic (3.1.0) - pg (>= 0.17, < 0.19) racc (1.4.12) rack (1.6.4) rack-cache (1.2) @@ -289,7 +294,7 @@ DEPENDENCIES qu-rails! qu-redis que - queue_classic + queue_classic! racc (>= 1.4.6) rack-cache (~> 1.2) rails! -- cgit v1.2.3 From d0e0fbafb205f96444d889c8654f18a9ee0bb328 Mon Sep 17 00:00:00 2001 From: Andrei Istratii Date: Wed, 5 Aug 2015 16:14:09 +0300 Subject: Migrate to Sprockets 4. --- Gemfile.lock | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 52e221c6fc..0882c45690 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,17 @@ GIT railties (>= 4.2.0) thor (>= 0.14, < 2.0) +GIT + remote: git://github.com/rails/sass-rails.git + revision: 805cb17722b8a13ff00dffe20283a6ba2c9a45dc + branch: master + specs: + sass-rails (6.0.0) + railties (>= 4.0.0, < 5.0) + sass (~> 3.3) + sprockets (>= 4.0) + sprockets-rails (< 4.0) + GIT remote: git://github.com/rails/sprockets-rails.git revision: ad4a43bd1bb19c86a8bf94a2ad5e477686161490 @@ -59,6 +70,14 @@ GIT activesupport (>= 4.0) sprockets (>= 3.0.0) +GIT + remote: git://github.com/rails/sprockets.git + revision: de057b4f13deb2bb5e8684cd06b9b687f5d09792 + branch: master + specs: + sprockets (4.0.0) + rack (~> 1.0) + PATH remote: . specs: @@ -215,6 +234,7 @@ GEM resque (~> 1.25) rufus-scheduler (~> 3.0) rufus-scheduler (3.1.3) + sass (3.4.16) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -237,8 +257,6 @@ GEM serverengine (~> 1.5.5) thor thread (~> 0.1.7) - sprockets (3.0.3) - rack (~> 1.0) sqlite3 (1.3.10) stackprof (0.2.7) sucker_punch (1.5.0) @@ -303,11 +321,13 @@ DEPENDENCIES redcarpet (~> 3.2.3) resque resque-scheduler + sass (>= 3.3) + sass-rails! sdoc (~> 0.4.0) sequel sidekiq sneakers - sprockets (~> 3.0.0.rc.1) + sprockets! sprockets-rails! sqlite3 (~> 1.3.6) stackprof -- cgit v1.2.3 From 51211a94bd7a34d80f2412a7f94fefe7366647a5 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 20 Aug 2015 13:43:57 -0700 Subject: point at rack master --- Gemfile.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 0882c45690..daaa208a74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,6 +25,13 @@ GIT mail (2.6.3.edge) mime-types (>= 1.16, < 3) +GIT + remote: git://github.com/rack/rack.git + revision: 2cb9430fce32da2f2dbccf9de97ab691351c1408 + specs: + rack (2.0.0.alpha) + json + GIT remote: git://github.com/rails/arel.git revision: d5432b4616ff43fbb14540d351eed351e21bb20e @@ -62,21 +69,21 @@ GIT GIT remote: git://github.com/rails/sprockets-rails.git - revision: ad4a43bd1bb19c86a8bf94a2ad5e477686161490 + revision: e65e088575be4f6b994823b80a277affb0a57a5e branch: master specs: - sprockets-rails (3.0.0) + sprockets-rails (3.0.0.beta2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) GIT remote: git://github.com/rails/sprockets.git - revision: de057b4f13deb2bb5e8684cd06b9b687f5d09792 + revision: 653de5268ba862ea23457291824180c67ad5dc99 branch: master specs: sprockets (4.0.0) - rack (~> 1.0) + rack (~> 2.x) PATH remote: . @@ -90,7 +97,7 @@ PATH actionpack (5.0.0.alpha) actionview (= 5.0.0.alpha) activesupport (= 5.0.0.alpha) - rack (~> 1.6) + rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) @@ -139,7 +146,7 @@ PATH GEM remote: https://rubygems.org/ specs: - amq-protocol (1.9.2) + amq-protocol (2.0.0) backburner (1.0.0) beaneater (~> 1.0) dante (> 0.1.5) @@ -149,11 +156,10 @@ GEM beaneater (1.0.0) benchmark-ips (2.3.0) builder (3.2.2) - bunny (1.7.0) + bunny (2.0.0) amq-protocol (>= 1.9.2) - byebug (5.0.0) - columnize (= 0.9.0) - celluloid (0.16.1) + byebug (6.0.2) + celluloid (0.16.0) timers (~> 4.0.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -162,7 +168,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - columnize (0.9.0) concurrent-ruby (0.9.1) connection_pool (2.2.0) dalli (2.7.4) @@ -173,7 +178,7 @@ GEM activerecord (>= 3.0, < 5.0) delayed_job (>= 3.0, < 4.1) erubis (2.7.0) - execjs (2.5.2) + execjs (2.6.0) hitimes (1.2.2) hitimes (1.2.2-x86-mingw32) i18n (0.7.0) @@ -181,7 +186,7 @@ GEM kindlerb (0.1.1) mustache nokogiri - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) metaclass (0.0.4) method_source (0.8.2) @@ -201,16 +206,13 @@ GEM psych (2.0.13) que (0.10.0) racc (1.4.12) - rack (1.6.4) rack-cache (1.2) rack (>= 0.4) - rack-protection (1.5.3) - rack rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) @@ -248,23 +250,20 @@ GEM redis (~> 3.2, >= 3.2.1) redis-namespace (~> 1.5, >= 1.5.2) sigdump (0.2.3) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sneakers (1.0.4) - bunny (~> 1.7.0) + sinatra (1.0) + rack (>= 1.0) + sneakers (1.1.0) + bunny (>= 1.7.0, <= 2.0.0) serverengine (~> 1.5.5) thor thread (~> 0.1.7) sqlite3 (1.3.10) stackprof (0.2.7) - sucker_punch (1.5.0) - celluloid (~> 0.16.0) + sucker_punch (1.5.1) + celluloid (= 0.16.0) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) - tilt (2.0.1) timers (4.0.1) hitimes turbolinks (2.5.3) @@ -315,6 +314,7 @@ DEPENDENCIES que queue_classic! racc (>= 1.4.6) + rack! rack-cache (~> 1.2) rails! rake (>= 10.3) @@ -337,4 +337,4 @@ DEPENDENCIES w3c_validators BUNDLED WITH - 1.10.5 + 1.10.6 -- cgit v1.2.3 From 1fbf5ad7f71f8b6fdf9639eb85f5fe9733c045bd Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 21 Aug 2015 16:40:53 -0700 Subject: dup the request and mutate its headers object. duping the request will dup it's underlying env hash. --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index daaa208a74..137d6e368b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GIT GIT remote: git://github.com/rack/rack.git - revision: 2cb9430fce32da2f2dbccf9de97ab691351c1408 + revision: be777e06bf4de18a7786af1e44647e1498ec1a5d specs: rack (2.0.0.alpha) json @@ -203,7 +203,7 @@ GEM nokogiri (1.6.6.2) mini_portile (~> 0.6.0) pg (0.18.2) - psych (2.0.13) + psych (2.0.15) que (0.10.0) racc (1.4.12) rack-cache (1.2) @@ -252,7 +252,7 @@ GEM sigdump (0.2.3) sinatra (1.0) rack (>= 1.0) - sneakers (1.1.0) + sneakers (1.1.1) bunny (>= 1.7.0, <= 2.0.0) serverengine (~> 1.5.5) thor -- cgit v1.2.3 From 5fe141638f1243ac6ae187ae14aa398b4c1875a2 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sat, 22 Aug 2015 17:57:45 -0700 Subject: use a request object in the session middleware This commit allows us to use one request object rather than allocating multiple request objects to deal with the session. --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 137d6e368b..7cd4832b3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GIT GIT remote: git://github.com/rack/rack.git - revision: be777e06bf4de18a7786af1e44647e1498ec1a5d + revision: c94e22401d4719b4d78378c7b63362cd692f9005 specs: rack (2.0.0.alpha) json @@ -79,7 +79,7 @@ GIT GIT remote: git://github.com/rails/sprockets.git - revision: 653de5268ba862ea23457291824180c67ad5dc99 + revision: a61550db7184fc83964fb983547ff09da9efa9be branch: master specs: sprockets (4.0.0) @@ -236,7 +236,7 @@ GEM resque (~> 1.25) rufus-scheduler (~> 3.0) rufus-scheduler (3.1.3) - sass (3.4.16) + sass (3.4.17) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) -- cgit v1.2.3