From a4c544d6518f96de77fa86c18ebd772a6c8b62b9 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 28 Oct 2019 09:29:43 -0500 Subject: [PATCH] Bundler upgrades --- Gemfile | 3 +-- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 7f672def8..8dc3ac399 100755 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,7 @@ source "https://rubygems.org" ruby "~> 2.6.5" -gem "rails", "6.0.0" # TODO: Upgrade to Rails 6 - +gem "rails" gem "active_model_serializers" gem "bunny" gem "delayed_job_active_record" # TODO: Get off of SQL backed jobs. Use Redis diff --git a/Gemfile.lock b/Gemfile.lock index cf3f1152e..12a5c635c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM railties (>= 3.2, < 6.1) globalid (0.4.2) activesupport (>= 4.2.0) - google-api-client (0.33.1) + google-api-client (0.33.2) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) @@ -127,9 +127,9 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.12) - google-cloud-core (1.3.2) + google-cloud-core (1.4.0) google-cloud-env (~> 1.0) - google-cloud-env (1.2.1) + google-cloud-env (1.3.0) faraday (~> 0.11) google-cloud-storage (1.21.1) addressable (~> 2.5) @@ -327,7 +327,7 @@ DEPENDENCIES rabbitmq_http_api_client rack-attack rack-cors - rails (= 6.0.0) + rails rails_12factor redis (~> 4.0) request_store