From ef6eedbad2429826ac6e1a7c3943daeded6462da Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 24 Jan 2018 14:36:52 +0000 Subject: [PATCH 1/1] Update paperclip --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 07ee5a386..e05edebc4 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" -gem "paperclip", "~> 5.0" +gem "paperclip", "~> 5.2" gem "rack-cors" gem "rails-i18n", "~> 4.0.0" gem "record_tag_helper" diff --git a/Gemfile.lock b/Gemfile.lock index c03ab51a5..7dd619b61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) i18n-js (3.0.3) i18n (~> 0.6, >= 0.6.6) @@ -211,7 +211,7 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (5.1.0) + paperclip (5.2.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) cocaine (~> 0.5.5) @@ -333,7 +333,7 @@ GEM tins (1.16.3) tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (4.1.3) + uglifier (4.1.4) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) useragent (0.16.9) @@ -391,7 +391,7 @@ DEPENDENCIES omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) - paperclip (~> 5.0) + paperclip (~> 5.2) pg (~> 0.18) poltergeist psych -- 2.43.2