From 56efc281895f4de19fd5ade241526fed454a7f8b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 21 Sep 2018 00:42:59 +0200 Subject: Update ruby dependencies (#8743) * Update ffi to 1.9.25 * Update private_address_check to 0.5.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0c2cf5490..70f6c6d56 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ group :development, :test do end group :production, :test do - gem 'private_address_check', '~> 0.4.1' + gem 'private_address_check', '~> 0.5' end group :test do -- cgit From a7f75485d1fd914eb3af124c130c401d6a291a9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Sep 2018 20:31:40 +0200 Subject: Bump pghero from 2.1.0 to 2.2.0 (#8782) Bumps [pghero](https://github.com/ankane/pghero) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.1.0...v2.2.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 70f6c6d56..6d2a22302 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'thor', '~> 0.20' gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.0' gem 'makara', '~> 0.4' -gem 'pghero', '~> 2.1' +gem 'pghero', '~> 2.2' gem 'dotenv-rails', '~> 2.2', '< 2.3' gem 'aws-sdk-s3', '~> 1.9', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 0425c41e5..fee604e4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -391,7 +391,7 @@ GEM equatable (~> 0.5.0) tty-color (~> 0.4.0) pg (1.0.0) - pghero (2.1.0) + pghero (2.2.0) activerecord pkg-config (1.3.0) powerpack (0.1.1) @@ -714,7 +714,7 @@ DEPENDENCIES paperclip-av-transcoder (~> 0.6) parallel_tests (~> 2.21) pg (~> 1.0) - pghero (~> 2.1) + pghero (~> 2.2) pkg-config (~> 1.3) posix-spawn! premailer-rails -- cgit From 29e2d9e1b7b2ae7e165d376806e11dfae05190c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Sep 2018 20:32:37 +0200 Subject: Bump mime-types from 3.1 to 3.2.2 (#8781) Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.1 to 3.2.2. - [Release notes](https://github.com/mime-types/ruby-mime-types/releases) - [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md) - [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.1...v3.2.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6d2a22302..e3c17b4a3 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem 'httplog', '~> 1.0' gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' gem 'link_header', '~> 0.0' -gem 'mime-types', '~> 3.1', require: 'mime/types/columnar' +gem 'mime-types', '~> 3.2', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' gem 'oj', '~> 3.5' diff --git a/Gemfile.lock b/Gemfile.lock index e86e97ffa..720000d86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -331,9 +331,9 @@ GEM microformats (4.0.7) json nokogiri - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) @@ -700,7 +700,7 @@ DEPENDENCIES mario-redis-lock (~> 1.2) memory_profiler microformats (~> 4.0) - mime-types (~> 3.1) + mime-types (~> 3.2) net-ldap (~> 0.10) nokogiri (~> 1.8) nsa (~> 0.2) -- cgit From 8096df1055e920ebf91504ec47e9617038b106c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 25 Sep 2018 20:33:00 +0200 Subject: Bump sidekiq from 5.1.3 to 5.2.2 (#8779) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.2. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e3c17b4a3..0abec9a5a 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 0.10' gem 'ruby-progressbar', '~> 1.4' gem 'sanitize', '~> 4.6' -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2' gem 'sidekiq-scheduler', '~> 2.2' gem 'sidekiq-unique-jobs', '~> 5.0' gem 'sidekiq-bulk', '~>0.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 720000d86..9035e04a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,7 @@ GEM coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -419,7 +419,7 @@ GEM rack-attack (5.2.0) rack rack-cors (1.0.2) - rack-protection (2.0.1) + rack-protection (2.0.4) rack rack-proxy (0.6.4) rack @@ -541,9 +541,8 @@ GEM scss_lint (0.57.0) rake (>= 0.9, < 13) sass (~> 3.5.5) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.2) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-bulk (0.1.1) @@ -740,7 +739,7 @@ DEPENDENCIES ruby-progressbar (~> 1.4) sanitize (~> 4.6) scss_lint (~> 0.57) - sidekiq (~> 5.1) + sidekiq (~> 5.2) sidekiq-bulk (~> 0.1.1) sidekiq-scheduler (~> 2.2) sidekiq-unique-jobs (~> 5.0) -- cgit From 6e075b9cc4796ded65db4962c95518cc5eb762f7 Mon Sep 17 00:00:00 2001 From: Grey Baker Date: Tue, 25 Sep 2018 20:27:53 +0100 Subject: Bump devise from 4.4.3 to 4.5.0 (#8778) Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0abec9a5a..3e4f88689 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'charlock_holmes', '~> 0.7.6' gem 'iso-639' gem 'chewy', '~> 5.0' gem 'cld3', '~> 3.2.0' -gem 'devise', '~> 4.4' +gem 'devise', '~> 4.5' gem 'devise-two-factor', '~> 3.0' group :pam_authentication, optional: true do diff --git a/Gemfile.lock b/Gemfile.lock index 9035e04a7..b3f5b66ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,7 @@ GEM rack (>= 1) rake (> 10, < 13) thor (~> 0.19) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -666,7 +666,7 @@ DEPENDENCIES cld3 (~> 3.2.0) climate_control (~> 0.2) derailed_benchmarks - devise (~> 4.4) + devise (~> 4.5) devise-two-factor (~> 3.0) devise_pam_authenticatable2 (~> 9.2) doorkeeper (~> 5.0) -- cgit From 65e7c6d9b52024809f71f226f87666299c4361b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Sep 2018 02:02:38 +0900 Subject: Bump tty-prompt from 0.16.0 to 0.17.0 (#8791) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.16.0 to 0.17.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.16.0...v0.17.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3e4f88689..cf57c2d4a 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' gem 'stoplight', '~> 2.1.3' gem 'strong_migrations', '~> 0.2' gem 'tty-command', '~> 0.8', require: false -gem 'tty-prompt', '~> 0.16', require: false +gem 'tty-prompt', '~> 0.17', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2018' gem 'webpacker', '~> 3.5' diff --git a/Gemfile.lock b/Gemfile.lock index 29a3dd180..1c9d2af64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,7 +252,7 @@ GEM heapy (0.1.3) highline (1.7.10) hiredis (0.6.1) - hitimes (1.2.6) + hitimes (1.3.0) hkdf (0.3.0) htmlentities (4.3.4) http (3.2.0) @@ -594,21 +594,21 @@ GEM tilt (2.0.8) timers (4.1.2) hitimes - tty-color (0.4.2) + tty-color (0.4.3) tty-command (0.8.0) pastel (~> 0.7.0) - tty-cursor (0.5.0) - tty-prompt (0.16.0) + tty-cursor (0.6.0) + tty-prompt (0.17.0) necromancer (~> 0.4.0) pastel (~> 0.7.0) timers (~> 4.0) - tty-cursor (~> 0.5.0) - tty-reader (~> 0.2.0) - tty-reader (0.2.0) - tty-cursor (~> 0.5.0) + tty-cursor (~> 0.6.0) + tty-reader (~> 0.4.0) + tty-reader (0.4.0) + tty-cursor (~> 0.6.0) tty-screen (~> 0.6.4) wisper (~> 2.0.0) - tty-screen (0.6.4) + tty-screen (0.6.5) twitter-text (1.14.7) unf (~> 0.1.0) tzinfo (1.2.5) @@ -753,7 +753,7 @@ DEPENDENCIES strong_migrations (~> 0.2) thor (~> 0.20) tty-command (~> 0.8) - tty-prompt (~> 0.16) + tty-prompt (~> 0.17) twitter-text (~> 1.14) tzinfo-data (~> 1.2018) webmock (~> 3.3) -- cgit From 7efa3d02c775cd3d66973c940e4e08f0669c4cc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Sep 2018 02:11:21 +0900 Subject: Bump sidekiq-scheduler from 2.2.1 to 3.0.0 (#8789) Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 2.2.1 to 3.0.0. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index cf57c2d4a..2fa4a1a47 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'rqrcode', '~> 0.10' gem 'ruby-progressbar', '~> 1.4' gem 'sanitize', '~> 4.6' gem 'sidekiq', '~> 5.2' -gem 'sidekiq-scheduler', '~> 2.2' +gem 'sidekiq-scheduler', '~> 3.0' gem 'sidekiq-unique-jobs', '~> 5.0' gem 'sidekiq-bulk', '~>0.1.1' gem 'simple-navigation', '~> 4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1c9d2af64..234e7b6f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,7 +202,7 @@ GEM encryptor (3.0.0) equatable (0.5.0) erubi (1.7.1) - et-orbi (1.1.0) + et-orbi (1.1.6) tzinfo excon (0.62.0) fabrication (2.20.1) @@ -225,6 +225,9 @@ GEM fog-json (>= 1.0) ipaddress (>= 0.8) formatador (0.2.5) + fugit (1.1.6) + et-orbi (~> 1.1, >= 1.1.6) + raabro (~> 1.1) fuubar (2.3.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -415,6 +418,7 @@ GEM puma (3.11.4) pundit (1.1.0) activesupport (>= 3.0.0) + raabro (1.1.6) rack (2.0.5) rack-attack (5.2.0) rack @@ -526,8 +530,8 @@ GEM ruby-progressbar (1.9.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) - rufus-scheduler (3.4.2) - et-orbi (~> 1.0) + rufus-scheduler (3.5.2) + fugit (~> 1.1, >= 1.1.5) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -548,7 +552,7 @@ GEM sidekiq-bulk (0.1.1) activesupport sidekiq - sidekiq-scheduler (2.2.1) + sidekiq-scheduler (3.0.0) redis (>= 3, < 5) rufus-scheduler (~> 3.2) sidekiq (>= 3) @@ -741,7 +745,7 @@ DEPENDENCIES scss_lint (~> 0.57) sidekiq (~> 5.2) sidekiq-bulk (~> 0.1.1) - sidekiq-scheduler (~> 2.2) + sidekiq-scheduler (~> 3.0) sidekiq-unique-jobs (~> 5.0) simple-navigation (~> 4.0) simple_form (~> 4.0) -- cgit From e046a987f6524bde31492ee9b5f5212ed78d081e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Sep 2018 18:24:06 +0200 Subject: Bump capistrano from 3.10.2 to 3.11.0 (#8801) Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.10.2 to 3.11.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 2fa4a1a47..c790cc162 100644 --- a/Gemfile +++ b/Gemfile @@ -132,7 +132,7 @@ group :development do gem 'bundler-audit', '~> 0.6', require: false gem 'scss_lint', '~> 0.57', require: false - gem 'capistrano', '~> 3.10' + gem 'capistrano', '~> 3.11' gem 'capistrano-rails', '~> 1.3' gem 'capistrano-rbenv', '~> 2.1' gem 'capistrano-yarn', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 79b1b0516..247321700 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (10.0.2) - capistrano (3.10.2) + capistrano (3.11.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -348,7 +348,7 @@ GEM net-ldap (0.16.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.2.0) + net-ssh (5.0.2) nio4r (2.3.1) nokogiri (1.8.4) mini_portile2 (~> 2.3.0) @@ -577,7 +577,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.16.0) + sshkit (1.17.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stackprof (0.2.12) @@ -660,7 +660,7 @@ DEPENDENCIES browser bullet (~> 5.7) bundler-audit (~> 0.6) - capistrano (~> 3.10) + capistrano (~> 3.11) capistrano-rails (~> 1.3) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) -- cgit From 5da51771cd3e39b56c1865cc59ed29aa042785f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 28 Sep 2018 13:34:31 +0200 Subject: Bump oj from 3.5.1 to 3.6.11 (#8815) Bumps [oj](https://github.com/ohler55/oj) from 3.5.1 to 3.6.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c790cc162..e4195c786 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'link_header', '~> 0.0' gem 'mime-types', '~> 3.2', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' -gem 'oj', '~> 3.5' +gem 'oj', '~> 3.6' gem 'ostatus2', '~> 2.0' gem 'ox', '~> 2.9' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' diff --git a/Gemfile.lock b/Gemfile.lock index 4cc31923d..18c8b6846 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,7 +359,7 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oj (3.5.1) + oj (3.6.11) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) @@ -707,7 +707,7 @@ DEPENDENCIES net-ldap (~> 0.10) nokogiri (~> 1.8) nsa (~> 0.2) - oj (~> 3.5) + oj (~> 3.6) omniauth (~> 1.2) omniauth-cas (~> 1.1) omniauth-saml (~> 1.10) -- cgit From e09301f4140ed458d7335f7f22df6c2591cc99cc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 29 Sep 2018 18:34:36 +0200 Subject: Adjust bootsnap configuration for newer version (#8826) --- Gemfile | 2 +- config/boot.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e4195c786..32c587476 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.5' -gem 'bootsnap', '~> 1.3' +gem 'bootsnap', '~> 1.3', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.6' gem 'iso-639' diff --git a/config/boot.rb b/config/boot.rb index 0a3cd4ebe..f82b2be0a 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,14 +1,14 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) -require 'bundler/setup' # Set up gems listed in the Gemfile. -require 'bootsnap' # Speed up boot time by caching expensive operations. +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. Bootsnap.setup( cache_dir: 'tmp/cache', - development_mode: ENV['RAILS_ENV'] == 'development', + development_mode: ENV.fetch('RAILS_ENV', 'development') == 'development', load_path_cache: true, autoload_paths_cache: true, - disable_trace: true, + disable_trace: false, compile_cache_iseq: false, compile_cache_yaml: false ) -- cgit From 746da5ccdadc1eda6cd8772e7f3044bb525c1e1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 1 Oct 2018 14:08:33 +0200 Subject: 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(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 32c587476..c5421e371 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 0e486cb07..f988d9662 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) -- cgit