From 6243a834115c9c815fe9a1224824f02f9fb3857f Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 30 Apr 2016 22:36:26 -0700 Subject: Bump mail_room to 0.7.0 to fix stuck IDLE connections Closes #13357 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 25c13fda575..8210f4cb3d5 100644 --- a/Gemfile +++ b/Gemfile @@ -319,7 +319,7 @@ gem "newrelic_rpm", '~> 3.14' gem 'octokit', '~> 4.3.0' -gem "mail_room", "~> 0.6.1" +gem "mail_room", "~> 0.7" gem 'email_reply_parser', '~> 0.5.8' -- cgit v1.2.1 From 66d7acfe4ddec5d5f16bc6a7d758343ff8573fd9 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Sun, 1 May 2016 13:44:50 -0600 Subject: Update rspec-rails from 3.3.3 to 3.4.2. This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 25c13fda575..c10fe0a1c7c 100644 --- a/Gemfile +++ b/Gemfile @@ -269,7 +269,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.4.0' gem 'factory_girl_rails', '~> 4.6.0' - gem 'rspec-rails', '~> 3.3.0' + gem 'rspec-rails', '~> 3.4.0' gem 'rspec-retry' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' -- cgit v1.2.1 From 3004386b55fede6381e5e0794c12625e2b83de25 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Tue, 3 May 2016 15:37:59 -0600 Subject: Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 25c13fda575..890fcbc1318 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.4' gem 'doorkeeper', '~> 3.1' +gem 'devise-async', '~> 0.9.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' -- cgit v1.2.1