~cytrogen/masto-fe

a8310b15ed95dc262084940d79edb2f456f96742 — Nick Schonning 2 years ago c2c3961
Update kt-paperclip 7.2 from sha (#25274)

2 files changed, 8 insertions(+), 14 deletions(-)

M Gemfile
M Gemfile.lock
M Gemfile => Gemfile +1 -1
@@ 20,7 20,7 @@ gem 'dotenv-rails', '~> 2.8'
gem 'aws-sdk-s3', '~> 1.123', require: false
gem 'fog-core', '<= 2.4.0'
gem 'fog-openstack', '~> 0.3', require: false
gem 'kt-paperclip', '~> 7.1', github: 'kreeti/kt-paperclip', ref: '11abf222dc31bff71160a1d138b445214f434b2b'
gem 'kt-paperclip', '~> 7.2'
gem 'blurhash', '~> 0.1'

gem 'active_model_serializers', '~> 0.10'

M Gemfile.lock => Gemfile.lock +7 -13
@@ 8,18 8,6 @@ GIT
      jwt (~> 2.0)

GIT
  remote: https://github.com/kreeti/kt-paperclip.git
  revision: 11abf222dc31bff71160a1d138b445214f434b2b
  ref: 11abf222dc31bff71160a1d138b445214f434b2b
  specs:
    kt-paperclip (7.1.1)
      activemodel (>= 4.2.0)
      activesupport (>= 4.2.0)
      marcel (~> 1.0.1)
      mime-types
      terrapin (~> 0.6.0)

GIT
  remote: https://github.com/mastodon/rails-settings-cached.git
  revision: 86328ef0bd04ce21cc0504ff5e334591e8c2ccab
  branch: v0.6.6-aliases-true


@@ 380,6 368,12 @@ GEM
      activerecord
      kaminari-core (= 1.2.2)
    kaminari-core (1.2.2)
    kt-paperclip (7.2.0)
      activemodel (>= 4.2.0)
      activesupport (>= 4.2.0)
      marcel (~> 1.0.1)
      mime-types
      terrapin (~> 0.6.0)
    launchy (2.5.2)
      addressable (~> 2.8)
    letter_opener (1.8.1)


@@ 813,7 807,7 @@ DEPENDENCIES
  json-ld-preloaded (~> 3.2)
  json-schema (~> 4.0)
  kaminari (~> 1.2)
  kt-paperclip (~> 7.1)!
  kt-paperclip (~> 7.2)
  letter_opener (~> 1.8)
  letter_opener_web (~> 2.0)
  link_header (~> 0.0)