From 789088cecf9233b9c651792972a5d6e141b09504 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 12:20:00 +1030 Subject: [PATCH 1/6] Upgrade elasticsearch warden uglifier eventmachine --- Gemfile.lock | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 904148060..0ce9854e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,16 +138,16 @@ GEM diff-lcs (1.2.5) docile (1.1.5) easy_diff (1.0.0) - elasticsearch (2.0.0) - elasticsearch-api (= 2.0.0) - elasticsearch-transport (= 2.0.0) - elasticsearch-api (2.0.0) + elasticsearch (2.0.1) + elasticsearch-api (= 2.0.1) + elasticsearch-transport (= 2.0.1) + elasticsearch-api (2.0.1) multi_json - elasticsearch-transport (2.0.0) + elasticsearch-transport (2.0.1) faraday multi_json erubis (2.7.0) - eventmachine (1.2.1) + eventmachine (1.2.2) exception_notification (4.2.1) actionmailer (>= 4.0, < 6) activesupport (>= 4.0, < 6) @@ -447,13 +447,13 @@ GEM tins (1.13.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (3.0.4) execjs (>= 0.3.0, < 3) unicode-display_width (1.1.3) utf8-cleaner (0.2.5) activesupport vcr (3.0.3) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webmock (2.1.0) addressable (>= 2.3.6) @@ -548,5 +548,8 @@ DEPENDENCIES vcr webmock +RUBY VERSION + ruby 2.3.3p222 + BUNDLED WITH 1.13.7 From 554cc36a8392f6e7e92c4c26897940ee0c0fbcb1 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 12:23:01 +1030 Subject: [PATCH 2/6] Upgrade coveralls font-awesome-rails font-awesome-sass --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ce9854e3..39f537468 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM compass-rails (2.0.0) compass (>= 0.12.2) connection_pool (2.2.1) - coveralls (0.8.17) + coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) term-ansicolor (~> 1.3) @@ -162,9 +162,9 @@ GEM i18n (~> 0.5) faraday (0.11.0) multipart-post (>= 1.2, < 3) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - font-awesome-sass (4.6.2) + font-awesome-sass (4.7.0) sass (>= 3.2) foundation-rails (5.4.5.0) railties (>= 3.1.0) @@ -190,7 +190,7 @@ GEM httparty (0.14.0) multi_xml (>= 0.5.2) httpclient (2.8.2.4) - i18n (0.7.0) + i18n (0.8.0) impressionist (1.5.1) httpclient (~> 2.2) nokogiri (~> 1.5) @@ -444,7 +444,7 @@ GEM thor (0.19.4) thread_safe (0.3.5) tilt (1.4.1) - tins (1.13.0) + tins (1.13.2) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (3.0.4) From a0168f7f8d6debcdb55b4672acf7522c659328c5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 12:24:46 +1030 Subject: [PATCH 3/6] Update test-unit --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39f537468..e0e07aa10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - power_assert (0.3.1) + power_assert (1.0.1) powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) @@ -432,7 +432,7 @@ GEM stringex (2.6.1) term-ansicolor (1.4.0) tins (~> 1.0) - test-unit (3.2.1) + test-unit (3.2.3) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) From 0917cab110d6ac6c2510a1d55eea3c389c8ba7a9 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 12:26:11 +1030 Subject: [PATCH 4/6] Upgrade capybara, which might trigger a few deprecations --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0e07aa10..f92226a3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) ambry (1.0.0) arel (6.0.4) ast (2.3.0) @@ -78,7 +79,7 @@ GEM bson (3.2.6) bson_ext (1.5.1) builder (3.2.3) - capybara (2.8.1) + capybara (2.12.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -293,6 +294,7 @@ GEM slop (~> 3.4) pry-nav (0.2.4) pry (>= 0.9.10, < 0.11.0) + public_suffix (2.0.5) pundit (1.1.0) activesupport (>= 3.0.0) quiet_assets (1.1.0) From f528cd2fb2ca8603ee5ab4af16bd4d161245910a Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 13:01:49 +1030 Subject: [PATCH 5/6] Upgrade to rails_admin 1.1.0+ --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f92226a3c..b7159592d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) compass (0.12.7) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -196,8 +196,9 @@ GEM httpclient (~> 2.2) nokogiri (~> 1.5) jmespath (1.3.1) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.2.2) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) @@ -303,9 +304,9 @@ GEM rack-attack (5.0.1) rack rack-cors (0.4.0) - rack-pjax (0.8.0) + rack-pjax (1.0.0) nokogiri (~> 1.5) - rack (~> 1.1) + rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.4.2) @@ -353,7 +354,7 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_admin (0.8.1) + rails_admin (1.1.1) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -362,10 +363,9 @@ GEM jquery-ui-rails (~> 5.0) kaminari (~> 0.14) nested_form (~> 0.3) - rack-pjax (~> 0.7) - rails (~> 4.0) - remotipart (~> 1.0) - safe_yaml (~> 1.0) + rack-pjax (>= 0.7) + rails (>= 4.0, < 6) + remotipart (~> 1.3) sass-rails (>= 4.0, < 6) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) @@ -377,7 +377,7 @@ GEM rainbow (2.2.1) rake (12.0.0) ref (2.0.0) - remotipart (1.2.1) + remotipart (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec-core (3.5.4) From aad2a41d274a171bb0e96b1e884863f72b3d94d0 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Feb 2017 13:09:02 +1030 Subject: [PATCH 6/6] Revert "Upgrade to rails_admin 1.1.0+" This reverts commit f528cd2fb2ca8603ee5ab4af16bd4d161245910a. --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b7159592d..f92226a3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.12.2) + coffee-script-source (1.10.0) compass (0.12.7) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -196,9 +196,8 @@ GEM httpclient (~> 2.2) nokogiri (~> 1.5) jmespath (1.3.1) - jquery-rails (4.2.2) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) + jquery-rails (3.1.4) + railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) @@ -304,9 +303,9 @@ GEM rack-attack (5.0.1) rack rack-cors (0.4.0) - rack-pjax (1.0.0) + rack-pjax (0.8.0) nokogiri (~> 1.5) - rack (>= 1.1) + rack (~> 1.1) rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.4.2) @@ -354,7 +353,7 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_admin (1.1.1) + rails_admin (0.8.1) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -363,9 +362,10 @@ GEM jquery-ui-rails (~> 5.0) kaminari (~> 0.14) nested_form (~> 0.3) - rack-pjax (>= 0.7) - rails (>= 4.0, < 6) - remotipart (~> 1.3) + rack-pjax (~> 0.7) + rails (~> 4.0) + remotipart (~> 1.0) + safe_yaml (~> 1.0) sass-rails (>= 4.0, < 6) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) @@ -377,7 +377,7 @@ GEM rainbow (2.2.1) rake (12.0.0) ref (2.0.0) - remotipart (1.3.1) + remotipart (1.2.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec-core (3.5.4)