[ARVADOS] updated: fb7bb4c8f17a49abab40e42b7a0101cac7478d60

Git user git at public.curoverse.com
Tue Mar 28 10:30:47 EDT 2017


Summary of changes:
 services/api/Gemfile      | 3 ++-
 services/api/Gemfile.lock | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

       via  fb7bb4c8f17a49abab40e42b7a0101cac7478d60 (commit)
      from  8d9b12f2a87ffd7183d3a36ca32ee1c7e701a0e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fb7bb4c8f17a49abab40e42b7a0101cac7478d60
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 28 10:30:37 2017 -0400

    7709: Avoid omniauth >= 1.5.0 to stay compatible with Ruby < 2.1.9

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 3e1d942..fde0248 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -38,7 +38,8 @@ gem 'acts_as_api'
 
 gem 'passenger'
 
-gem 'omniauth', '~> 1.1'
+# Restricted because omniauth >= 1.5.0 requires Ruby >= 2.1.9:
+gem 'omniauth', '~> 1.4.0'
 gem 'omniauth-oauth2', '~> 1.1'
 
 gem 'andand'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 3c5a476..7cee322 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -177,9 +177,9 @@ GEM
       rack (>= 1.2, < 3)
     oj (2.18.5)
     oj_mimic_json (1.0.1)
-    omniauth (1.6.1)
-      hashie (>= 3.4.6, < 3.6.0)
-      rack (>= 1.6.2, < 3)
+    omniauth (1.4.2)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
@@ -295,7 +295,7 @@ DEPENDENCIES
   multi_json
   oj
   oj_mimic_json
-  omniauth (~> 1.1)
+  omniauth (~> 1.4.0)
   omniauth-oauth2 (~> 1.1)
   passenger
   pg

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list