From f7a986012a6099445e20b6414d253ee0fc039118 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Wed, 27 Apr 2016 15:47:22 -0500 Subject: Prep Rails 5 beta 4 --- Gemfile.lock | 72 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 3bbaee414f..02fada726d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,58 +36,58 @@ GIT PATH remote: . specs: - actioncable (5.0.0.beta3) - actionpack (= 5.0.0.beta3) + actioncable (5.0.0.beta4) + actionpack (= 5.0.0.beta4) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta3) - actionpack (= 5.0.0.beta3) - actionview (= 5.0.0.beta3) - activejob (= 5.0.0.beta3) + actionmailer (5.0.0.beta4) + actionpack (= 5.0.0.beta4) + actionview (= 5.0.0.beta4) + activejob (= 5.0.0.beta4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta3) - actionview (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) + actionpack (5.0.0.beta4) + actionview (= 5.0.0.beta4) + activesupport (= 5.0.0.beta4) rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta3) - activesupport (= 5.0.0.beta3) + actionview (5.0.0.beta4) + activesupport (= 5.0.0.beta4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta3) - activesupport (= 5.0.0.beta3) + activejob (5.0.0.beta4) + activesupport (= 5.0.0.beta4) globalid (>= 0.3.6) - activemodel (5.0.0.beta3) - activesupport (= 5.0.0.beta3) - activerecord (5.0.0.beta3) - activemodel (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) + activemodel (5.0.0.beta4) + activesupport (= 5.0.0.beta4) + activerecord (5.0.0.beta4) + activemodel (= 5.0.0.beta4) + activesupport (= 5.0.0.beta4) arel (~> 7.0) - activesupport (5.0.0.beta3) + activesupport (5.0.0.beta4) concurrent-ruby (~> 1.0) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - rails (5.0.0.beta3) - actioncable (= 5.0.0.beta3) - actionmailer (= 5.0.0.beta3) - actionpack (= 5.0.0.beta3) - actionview (= 5.0.0.beta3) - activejob (= 5.0.0.beta3) - activemodel (= 5.0.0.beta3) - activerecord (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) + rails (5.0.0.beta4) + actioncable (= 5.0.0.beta4) + actionmailer (= 5.0.0.beta4) + actionpack (= 5.0.0.beta4) + actionview (= 5.0.0.beta4) + activejob (= 5.0.0.beta4) + activemodel (= 5.0.0.beta4) + activerecord (= 5.0.0.beta4) + activesupport (= 5.0.0.beta4) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta3) + railties (= 5.0.0.beta4) sprockets-rails (>= 2.0.0) - railties (5.0.0.beta3) - actionpack (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) + railties (5.0.0.beta4) + actionpack (= 5.0.0.beta4) + activesupport (= 5.0.0.beta4) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -154,11 +154,13 @@ GEM rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) minitest (5.3.3) mocha (0.14.0) -- cgit v1.2.3 From 06dc3fba4623a77e3cc7fa04f97723462d47bf1e Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Mon, 2 May 2016 15:04:59 -0700 Subject: Fix template resolver cache concurrency: "can't add a new key into hash during iteration" Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529 Fixes #24627. --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 02fada726d..1508f3d3ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ PATH activesupport (= 5.0.0.beta4) arel (~> 7.0) activesupport (5.0.0.beta4) - concurrent-ruby (~> 1.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) @@ -116,7 +116,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) connection_pool (2.2.0) dalli (2.7.6) dante (0.2.0) -- cgit v1.2.3 From 5a4f7fc33f3a69fbdae8c3b3adc6c832fecd9fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 6 May 2016 16:16:28 -0500 Subject: Upgrade all gems to make sure Rails works with rack 2.0.0.rc1 --- Gemfile.lock | 72 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 1508f3d3ac..d52b851de3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/QueueClassic/queue_classic.git - revision: 2e3b624f3043849751b24a758d8c156337ead862 + revision: c26f2c9f6f6133b946fbcdd7b7ec905a4aca9f94 branch: master specs: queue_classic (3.2.0.RC1) @@ -21,10 +21,10 @@ GIT GIT remote: git://github.com/sass/sass.git - revision: ac8e7aa8e99c425237c708f347f76495a2e18519 + revision: 6e8a053f3f1b3c58d3c7db057d7df80e8fee3752 branch: stable specs: - sass (3.4.21) + sass (3.4.22) GIT remote: git://github.com/turbolinks/turbolinks-rails.git @@ -97,18 +97,18 @@ GEM specs: amq-protocol (2.0.1) arel (7.0.0) - backburner (1.2.0) + backburner (1.3.0) beaneater (~> 1.0) dante (> 0.1.5) bcrypt (3.1.11) bcrypt (3.1.11-x64-mingw32) bcrypt (3.1.11-x86-mingw32) beaneater (1.0.0) - benchmark-ips (2.3.0) + benchmark-ips (2.6.1) builder (3.2.2) bunny (2.2.2) amq-protocol (>= 2.0.1) - byebug (8.2.1) + byebug (8.2.5) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -129,7 +129,9 @@ GEM eventmachine (~> 1.0) hiredis (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.9.1) + eventmachine (1.2.0.1) + eventmachine (1.2.0.1-x64-mingw32) + eventmachine (1.2.0.1-x86-mingw32) execjs (2.6.0) faye-websocket (0.10.3) eventmachine (>= 0.12.0) @@ -141,17 +143,17 @@ GEM activesupport (>= 4.1.0) hiredis (0.6.1) i18n (0.7.0) - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) kindlerb (0.1.1) mustache nokogiri - listen (3.0.5) + listen (3.0.7) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + rb-inotify (>= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -166,8 +168,8 @@ GEM mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.0) - multi_json (1.11.2) - mustache (1.0.2) + multi_json (1.12.0) + mustache (1.0.3) mysql2 (0.4.4) mysql2 (0.4.4-x64-mingw32) mysql2 (0.4.4-x86-mingw32) @@ -182,12 +184,12 @@ GEM pg (0.18.4-x64-mingw32) pg (0.18.4-x86-mingw32) psych (2.0.17) - puma (2.16.0) - que (0.11.2) + puma (3.4.0) + que (0.11.4) racc (1.4.14) - rack (2.0.0.alpha) + rack (2.0.0.rc1) json - rack-cache (1.5.1) + rack-cache (1.6.1) rack (>= 0.4) rack-test (0.6.3) rack (>= 1.0) @@ -199,13 +201,14 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rake (11.1.1) + rake (11.1.2) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) - rdoc (4.2.1) + rdoc (4.2.2) + json (~> 1.4) redcarpet (3.2.3) - redis (3.2.2) + redis (3.3.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) resque (1.25.2) @@ -214,23 +217,23 @@ GEM redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-scheduler (4.0.0) + resque-scheduler (4.2.0) mono_logger (~> 1.0) redis (~> 3.0) resque (~> 1.25) - rufus-scheduler (~> 3.0) - rufus-scheduler (3.2.0) + rufus-scheduler (~> 3.2) + rufus-scheduler (3.2.1) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sequel (4.30.0) + sequel (4.34.0) serverengine (1.5.11) sigdump (~> 0.2.2) - sidekiq (4.0.2) + sidekiq (4.1.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) - sigdump (0.2.3) + sigdump (0.2.4) sinatra (1.0) rack (>= 1.0) sneakers (2.3.5) @@ -238,7 +241,7 @@ GEM serverengine (~> 1.5.11) thor thread (~> 0.1.7) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.0.4) @@ -248,20 +251,19 @@ GEM sqlite3 (1.3.11) sqlite3 (1.3.11-x64-mingw32) sqlite3 (1.3.11-x86-mingw32) - stackprof (0.2.8) - sucker_punch (2.0.0) + stackprof (0.2.9) + sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) - turbolinks-source (5.0.0.beta2) + turbolinks-source (5.0.0.beta4) tzinfo (1.2.2) thread_safe (~> 0.1) - tzinfo-data (1.2015.7) + tzinfo-data (1.2016.4) tzinfo (>= 1.0.0) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) vegas (0.1.11) rack (>= 1.0.0) w3c_validators (1.2) -- cgit v1.2.3 From fbdcf5221ad7ea3d40ad09651962fc85d101dd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 6 May 2016 16:54:40 -0500 Subject: Preparing for 5.0.0.rc1 release --- Gemfile.lock | 64 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index d52b851de3..e658f2bbfa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,58 +36,58 @@ GIT PATH remote: . specs: - actioncable (5.0.0.beta4) - actionpack (= 5.0.0.beta4) + actioncable (5.0.0.rc1) + actionpack (= 5.0.0.rc1) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta4) - actionpack (= 5.0.0.beta4) - actionview (= 5.0.0.beta4) - activejob (= 5.0.0.beta4) + actionmailer (5.0.0.rc1) + actionpack (= 5.0.0.rc1) + actionview (= 5.0.0.rc1) + activejob (= 5.0.0.rc1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta4) - actionview (= 5.0.0.beta4) - activesupport (= 5.0.0.beta4) + actionpack (5.0.0.rc1) + actionview (= 5.0.0.rc1) + activesupport (= 5.0.0.rc1) rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta4) - activesupport (= 5.0.0.beta4) + actionview (5.0.0.rc1) + activesupport (= 5.0.0.rc1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta4) - activesupport (= 5.0.0.beta4) + activejob (5.0.0.rc1) + activesupport (= 5.0.0.rc1) globalid (>= 0.3.6) - activemodel (5.0.0.beta4) - activesupport (= 5.0.0.beta4) - activerecord (5.0.0.beta4) - activemodel (= 5.0.0.beta4) - activesupport (= 5.0.0.beta4) + activemodel (5.0.0.rc1) + activesupport (= 5.0.0.rc1) + activerecord (5.0.0.rc1) + activemodel (= 5.0.0.rc1) + activesupport (= 5.0.0.rc1) arel (~> 7.0) - activesupport (5.0.0.beta4) + activesupport (5.0.0.rc1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - rails (5.0.0.beta4) - actioncable (= 5.0.0.beta4) - actionmailer (= 5.0.0.beta4) - actionpack (= 5.0.0.beta4) - actionview (= 5.0.0.beta4) - activejob (= 5.0.0.beta4) - activemodel (= 5.0.0.beta4) - activerecord (= 5.0.0.beta4) - activesupport (= 5.0.0.beta4) + rails (5.0.0.rc1) + actioncable (= 5.0.0.rc1) + actionmailer (= 5.0.0.rc1) + actionpack (= 5.0.0.rc1) + actionview (= 5.0.0.rc1) + activejob (= 5.0.0.rc1) + activemodel (= 5.0.0.rc1) + activerecord (= 5.0.0.rc1) + activesupport (= 5.0.0.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta4) + railties (= 5.0.0.rc1) sprockets-rails (>= 2.0.0) - railties (5.0.0.beta4) - actionpack (= 5.0.0.beta4) - activesupport (= 5.0.0.beta4) + railties (5.0.0.rc1) + actionpack (= 5.0.0.rc1) + activesupport (= 5.0.0.rc1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) -- cgit v1.2.3 From c80446fbee0c9cabba9dcb3ac3a63c6ca150f65c Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Tue, 10 May 2016 10:43:56 +0530 Subject: Fix Gemfile.lock by updating rails-dom-testing - Followup of https://github.com/rails/rails/pull/24946. --- Gemfile.lock | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index e658f2bbfa..2e3b0349a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,19 +45,19 @@ PATH actionview (= 5.0.0.rc1) activejob (= 5.0.0.rc1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) actionpack (5.0.0.rc1) actionview (= 5.0.0.rc1) activesupport (= 5.0.0.rc1) rack (~> 2.x) rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionview (5.0.0.rc1) activesupport (= 5.0.0.rc1) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) activejob (5.0.0.rc1) activesupport (= 5.0.0.rc1) @@ -193,12 +193,9 @@ GEM rack (>= 0.4) rack-test (0.6.3) rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (2.0.0) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) rake (11.1.2) -- cgit v1.2.3 From 8ecc5ab1d88532a239f17c7520ed922c7579b01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 10 May 2016 01:07:09 -0300 Subject: Start Rails 5.1 development :tada: --- Gemfile.lock | 118 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 55 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 2e3b0349a6..504364e552 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,21 +7,31 @@ GIT pg (>= 0.17, < 0.19) GIT - remote: git://github.com/bkeepers/qu.git - revision: d098e2657c92e89a6413bebd9c033930759c061f - branch: master + remote: git://github.com/collectiveidea/delayed_job.git + revision: 71f1d5faf934d3057abca942f0d410327bc69087 specs: - qu (0.2.0) - qu-rails (0.2.0) - qu (= 0.2.0) - railties (>= 3.2, < 5) - qu-redis (0.2.0) - qu (= 0.2.0) - redis-namespace + delayed_job (4.1.1) + activesupport (>= 3.0, < 5.1) + +GIT + remote: git://github.com/collectiveidea/delayed_job_active_record.git + revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad + specs: + delayed_job_active_record (4.1.0) + activerecord (>= 3.0, < 5.1) + delayed_job (>= 3.0, < 5) + +GIT + remote: git://github.com/rails/coffee-rails.git + revision: aa2e623cbda4f3c789a0a15d1f707239e68f5736 + specs: + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.2.x) GIT remote: git://github.com/sass/sass.git - revision: 6e8a053f3f1b3c58d3c7db057d7df80e8fee3752 + revision: 3fda1cbe70d615e7ef96e28db4fd1f8a3ebb5505 branch: stable specs: sass (3.4.22) @@ -36,58 +46,58 @@ GIT PATH remote: . specs: - actioncable (5.0.0.rc1) - actionpack (= 5.0.0.rc1) + actioncable (5.1.0.alpha) + actionpack (= 5.1.0.alpha) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) + actionmailer (5.1.0.alpha) + actionpack (= 5.1.0.alpha) + actionview (= 5.1.0.alpha) + activejob (= 5.1.0.alpha) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.0.rc1) - actionview (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + actionpack (5.1.0.alpha) + actionview (= 5.1.0.alpha) + activesupport (= 5.1.0.alpha) rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.rc1) - activesupport (= 5.0.0.rc1) + actionview (5.1.0.alpha) + activesupport (= 5.1.0.alpha) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.rc1) - activesupport (= 5.0.0.rc1) + activejob (5.1.0.alpha) + activesupport (= 5.1.0.alpha) globalid (>= 0.3.6) - activemodel (5.0.0.rc1) - activesupport (= 5.0.0.rc1) - activerecord (5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + activemodel (5.1.0.alpha) + activesupport (= 5.1.0.alpha) + activerecord (5.1.0.alpha) + activemodel (= 5.1.0.alpha) + activesupport (= 5.1.0.alpha) arel (~> 7.0) - activesupport (5.0.0.rc1) + activesupport (5.1.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - rails (5.0.0.rc1) - actioncable (= 5.0.0.rc1) - actionmailer (= 5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activerecord (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + rails (5.1.0.alpha) + actioncable (= 5.1.0.alpha) + actionmailer (= 5.1.0.alpha) + actionpack (= 5.1.0.alpha) + actionview (= 5.1.0.alpha) + activejob (= 5.1.0.alpha) + activemodel (= 5.1.0.alpha) + activerecord (= 5.1.0.alpha) + activesupport (= 5.1.0.alpha) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.rc1) + railties (= 5.1.0.alpha) sprockets-rails (>= 2.0.0) - railties (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + railties (5.1.0.alpha) + actionpack (= 5.1.0.alpha) + activesupport (= 5.1.0.alpha) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -109,9 +119,6 @@ GEM bunny (2.2.2) amq-protocol (>= 2.0.1) byebug (8.2.5) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs @@ -120,11 +127,6 @@ GEM connection_pool (2.2.0) dalli (2.7.6) dante (0.2.0) - delayed_job (4.1.1) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.1.0) - activerecord (>= 3.0, < 5) - delayed_job (>= 3.0, < 5) em-hiredis (0.3.1) eventmachine (~> 1.0) hiredis (~> 0.6.0) @@ -185,6 +187,12 @@ GEM pg (0.18.4-x86-mingw32) psych (2.0.17) puma (3.4.0) + qu (0.2.0) + multi_json + qu-redis (0.2.0) + qu (= 0.2.0) + redis-namespace + simple_uuid que (0.11.4) racc (1.4.14) rack (2.0.0.rc1) @@ -231,6 +239,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sigdump (0.2.4) + simple_uuid (0.4.0) sinatra (1.0) rack (>= 1.0) sneakers (2.3.5) @@ -284,10 +293,10 @@ DEPENDENCIES bcrypt (~> 3.1.11) benchmark-ips byebug - coffee-rails (~> 4.1.0) + coffee-rails! dalli (>= 2.2.1) - delayed_job - delayed_job_active_record + delayed_job! + delayed_job_active_record! em-hiredis faye-websocket hiredis @@ -301,7 +310,6 @@ DEPENDENCIES pg (>= 0.18.0) psych (~> 2.0) puma - qu-rails! qu-redis que queue_classic! -- cgit v1.2.3 From 61483b18bcbfaa054113a67f40515c7bf3e892b2 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Sun, 22 May 2016 02:15:58 +0800 Subject: Remove Blade gem dependency Apps that depend on Action Cable don't need Blade for app development, so we can remove the gem dependency. We do need Blade for Action Cable dev, so we bundle it in the Gemfile. Signed-off-by: Jeremy Daer --- Gemfile.lock | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 504364e552..6761292398 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,6 +105,7 @@ PATH GEM remote: https://rubygems.org/ specs: + addressable (2.4.0) amq-protocol (2.0.1) arel (7.0.0) backburner (1.3.0) @@ -115,6 +116,19 @@ GEM bcrypt (3.1.11-x86-mingw32) beaneater (1.0.0) benchmark-ips (2.6.1) + blade (0.5.1) + activesupport (>= 3.0.0) + blade-qunit_adapter (~> 1.20.0) + coffee-script (~> 2.4.0) + coffee-script-source (~> 1.10.0) + curses (~> 1.0.0) + eventmachine (~> 1.2.0) + faye (~> 1.1.1) + sprockets (~> 3.6.0) + thin (~> 1.6.0) + thor (~> 0.19.1) + useragent (~> 0.16.7) + blade-qunit_adapter (1.20.0) builder (3.2.2) bunny (2.2.2) amq-protocol (>= 2.0.1) @@ -125,16 +139,35 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) connection_pool (2.2.0) + cookiejar (0.3.0) + curses (1.0.2) + daemons (1.2.3) dalli (2.7.6) dante (0.2.0) em-hiredis (0.3.1) eventmachine (~> 1.0) hiredis (~> 0.6.0) + em-http-request (1.1.3) + addressable (>= 2.3.4) + cookiejar (<= 0.3.0) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) + em-socksify (0.3.1) + eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) eventmachine (1.2.0.1) eventmachine (1.2.0.1-x64-mingw32) eventmachine (1.2.0.1-x86-mingw32) execjs (2.6.0) + faye (1.1.2) + cookiejar (>= 0.3.0) + em-http-request (>= 0.3.0) + eventmachine (>= 0.12.0) + faye-websocket (>= 0.9.1) + multi_json (>= 1.0.0) + rack (>= 1.0.0) + websocket-driver (>= 0.5.1) faye-websocket (0.10.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -144,6 +177,7 @@ GEM globalid (0.3.6) activesupport (>= 4.1.0) hiredis (0.6.1) + http_parser.rb (0.6.0) i18n (0.7.0) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) @@ -260,6 +294,10 @@ GEM stackprof (0.2.9) sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) + thin (1.6.2) + daemons (>= 1.0.9) + eventmachine (>= 1.0.0) + rack (>= 1.0.0) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) @@ -270,6 +308,7 @@ GEM tzinfo (>= 1.0.0) uglifier (3.0.0) execjs (>= 0.3.0, < 3) + useragent (0.16.7) vegas (0.1.11) rack (>= 1.0.0) w3c_validators (1.2) @@ -292,6 +331,7 @@ DEPENDENCIES backburner bcrypt (~> 3.1.11) benchmark-ips + blade (~> 0.5.1) byebug coffee-rails! dalli (>= 2.2.1) -- cgit v1.2.3 From 11078dddbb94c620bff13a7c656390392b2007f8 Mon Sep 17 00:00:00 2001 From: Javan Makhmali Date: Mon, 23 May 2016 09:37:16 -0400 Subject: Build action_cable.js with Blade --- Gemfile.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 6761292398..4a9ac10244 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,15 +116,16 @@ GEM bcrypt (3.1.11-x86-mingw32) beaneater (1.0.0) benchmark-ips (2.6.1) - blade (0.5.1) + blade (0.5.5) activesupport (>= 3.0.0) blade-qunit_adapter (~> 1.20.0) - coffee-script (~> 2.4.0) - coffee-script-source (~> 1.10.0) + coffee-script + coffee-script-source curses (~> 1.0.0) - eventmachine (~> 1.2.0) - faye (~> 1.1.1) - sprockets (~> 3.6.0) + eventmachine + faye + sprockets (>= 3.0) + sprockets-export (~> 0.9.1) thin (~> 1.6.0) thor (~> 0.19.1) useragent (~> 0.16.7) @@ -284,6 +285,7 @@ GEM sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-export (0.9.1) sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) @@ -331,7 +333,7 @@ DEPENDENCIES backburner bcrypt (~> 3.1.11) benchmark-ips - blade (~> 0.5.1) + blade (~> 0.5.5) byebug coffee-rails! dalli (>= 2.2.1) -- cgit v1.2.3 From 8cfce058d9d002526fd93e66957f8359985c92bf Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Mon, 9 May 2016 15:42:28 -0400 Subject: CI: run Action Cable browser tests in Sauce Labs Allow failures until test runs are consistently stable, not hanging. Closes #24943. Signed-off-by: Jeremy Daer --- Gemfile.lock | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 4a9ac10244..41fd2197e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,15 @@ GIT activerecord (>= 3.0, < 5.1) delayed_job (>= 3.0, < 5) +GIT + remote: git://github.com/javan/blade-sauce_labs_plugin.git + revision: dd4230c556aaa19b62cca757d6faeb2bb6bf95e7 + specs: + blade-sauce_labs_plugin (0.5.1) + childprocess + faraday + selenium-webdriver + GIT remote: git://github.com/rails/coffee-rails.git revision: aa2e623cbda4f3c789a0a15d1f707239e68f5736 @@ -134,6 +143,8 @@ GEM bunny (2.2.2) amq-protocol (>= 2.0.1) byebug (8.2.5) + childprocess (0.5.9) + ffi (~> 1.0, >= 1.0.11) coffee-script (2.4.1) coffee-script-source execjs @@ -161,6 +172,8 @@ GEM eventmachine (1.2.0.1-x64-mingw32) eventmachine (1.2.0.1-x86-mingw32) execjs (2.6.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) faye (1.1.2) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) @@ -206,6 +219,7 @@ GEM metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.12.0) + multipart-post (2.0.0) mustache (1.0.3) mysql2 (0.4.4) mysql2 (0.4.4-x64-mingw32) @@ -262,10 +276,15 @@ GEM redis (~> 3.0) resque (~> 1.25) rufus-scheduler (~> 3.2) + rubyzip (1.2.0) rufus-scheduler (3.2.1) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + selenium-webdriver (2.53.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) + websocket (~> 1.0) sequel (4.34.0) serverengine (1.5.11) sigdump (~> 0.2.2) @@ -317,6 +336,7 @@ GEM json nokogiri wdm (0.1.1) + websocket (1.2.3) websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -334,6 +354,7 @@ DEPENDENCIES bcrypt (~> 3.1.11) benchmark-ips blade (~> 0.5.5) + blade-sauce_labs_plugin! byebug coffee-rails! dalli (>= 2.2.1) @@ -378,4 +399,4 @@ DEPENDENCIES wdm (>= 0.1.0) BUNDLED WITH - 1.11.2 + 1.12.4 -- cgit v1.2.3 From b22fc4972da29ede12ffaff9d5387688d8d2b8b6 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Wed, 25 May 2016 09:43:15 -0700 Subject: Revert back to a compatible bundler version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 41fd2197e3..7cddaa7e3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -399,4 +399,4 @@ DEPENDENCIES wdm (>= 0.1.0) BUNDLED WITH - 1.12.4 + 1.11.2 -- cgit v1.2.3