diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 14:36:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 14:36:06 +0200 |
| commit | 24d05c7a5020f0e8708f13cb21125a86e1ae5299 (patch) | |
| tree | e12c38119b74b4102493ae27451f4f308e0957a6 | |
| parent | c91d9b7389c489980fe98812a8f3884b2d41e19e (diff) | |
| parent | 793fb7499dd9fc651a02578ef664c9aa22b2758c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | config/boot.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile index 9826a59eb..ef2644eb2 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,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 44fa27fe2..f7e4fcd97 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) @@ -377,7 +377,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) @@ -715,7 +715,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) diff --git a/config/boot.rb b/config/boot.rb index f82b2be0a..593f575e9 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', |