From 2f4a68726d9afea049e18a680d315d03540a9660 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 5 Mar 2018 11:33:06 +0100 Subject: [PATCH 1/2] Revert "Bump development gems" This reverts commit 53e5f26a2ef579df2f70c704fea504ecbba64932. --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4541499d..839f36379 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,7 +115,7 @@ GEM sass (>= 3.3.4) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - brakeman (4.2.0) + brakeman (4.1.1) browser (2.5.3) builder (3.2.3) byebug (10.0.0) @@ -672,9 +672,9 @@ GEM scenic (1.4.1) activerecord (>= 4.0.0) railties (>= 4.0.0) - scss_lint (0.57.0) + scss_lint (0.56.0) rake (>= 0.9, < 13) - sass (~> 3.5.5) + sass (~> 3.5.3) securecompare (1.0.0) select2-rails (4.0.3) thor (~> 0.14) From 2395e4608e65a42ecd96999ac7e1d20f2bae1cc1 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 5 Mar 2018 11:33:14 +0100 Subject: [PATCH 2/2] Revert "Bump default gems" This reverts commit d01a1385b02a94e84c335642ba0ee580119ebaf1. --- Gemfile.lock | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 839f36379..521d9f5cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,6 @@ GEM momentjs-rails (~> 2.8) sass-rails (~> 5.0) selectize-rails (~> 0.6) - aes_key_wrap (1.0.1) apipie-rails (0.5.6) rails (>= 4.1) archive-zip (0.11.0) @@ -116,7 +115,7 @@ GEM bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) brakeman (4.1.1) - browser (2.5.3) + browser (2.5.2) builder (3.2.3) byebug (10.0.0) capybara (2.18.0) @@ -138,7 +137,7 @@ GEM carrierwave-i18n (0.2.0) case_transform (0.2) activesupport - chartkick (2.3.2) + chartkick (2.2.5) childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) chromedriver-helper (1.2.0) @@ -425,9 +424,8 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.1.0) - json-jwt (1.9.2) + json-jwt (1.8.3) activesupport - aes_key_wrap bindata securecompare url_safe_base64 @@ -513,9 +511,10 @@ GEM oauth2 (~> 1.1) omniauth (~> 1.2) open4 (1.3.4) - openid_connect (1.1.5) + openid_connect (1.1.4) activemodel attr_required (>= 1.0.0) + json (>= 1.4.3) json-jwt (>= 1.5.0) rack-oauth2 (>= 1.6.1) swd (>= 1.0.0) @@ -523,7 +522,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openstack (3.3.17) + openstack (3.3.15) json orm_adapter (0.5.0) parallel (1.12.1) @@ -550,11 +549,11 @@ GEM rack rack-mini-profiler (0.10.7) rack (>= 1.2.0) - rack-oauth2 (1.9.0) + rack-oauth2 (1.8.2) activesupport attr_required httpclient - json-jwt (>= 1.9.0) + json-jwt rack rack-protection (2.0.1) rack