From ac15c26c293e5bd79300ec7ace7b93d8812ff412 Mon Sep 17 00:00:00 2001 From: abcang Date: Mon, 1 Oct 2018 21:06:40 +0900 Subject: [PATCH 1/3] Fix requirie bootsnap (#8836) --- config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boot.rb b/config/boot.rb index f82b2be0a29..593f575e9a5 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,7 +1,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. -require 'bootsnap/setup' # Speed up boot time by caching expensive operations. +require 'bootsnap' # Speed up boot time by caching expensive operations. Bootsnap.setup( cache_dir: 'tmp/cache', From 746da5ccdadc1eda6cd8772e7f3044bb525c1e1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 1 Oct 2018 14:08:33 +0200 Subject: [PATCH 2/3] Bump ox from 2.9.2 to 2.10.0 (#8837) Bumps [ox](https://github.com/ohler55/ox) from 2.9.2 to 2.10.0. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.9.2...v2.10.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 32c587476c3..c5421e3714b 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' gem 'oj', '~> 3.6' gem 'ostatus2', '~> 2.0' -gem 'ox', '~> 2.9' +gem 'ox', '~> 2.10' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' gem 'pundit', '~> 1.1' gem 'premailer-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 0e486cb07f3..f988d966228 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -375,7 +375,7 @@ GEM addressable (~> 2.5) http (~> 3.0) nokogiri (~> 1.8) - ox (2.9.2) + ox (2.10.0) paperclip (6.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -712,7 +712,7 @@ DEPENDENCIES omniauth-cas (~> 1.1) omniauth-saml (~> 1.10) ostatus2 (~> 2.0) - ox (~> 2.9) + ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) parallel_tests (~> 2.21) From 793fb7499dd9fc651a02578ef664c9aa22b2758c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 1 Oct 2018 14:10:07 +0200 Subject: [PATCH 3/3] Bump annotate from 2.7.3 to 2.7.4 (#8840) Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.3 to 2.7.4. - [Release notes](https://github.com/ctran/annotate_models/releases) - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc) - [Commits](https://github.com/ctran/annotate_models/compare/v2.7.3...v2.7.4) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f988d966228..3a8e2c5c560 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) - annotate (2.7.3) + annotate (2.7.4) activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (9.0.0)