From 20765e353a8700723b97ab01483bf40b5d00868f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:33:24 +0000 Subject: [PATCH] Bump paperclip from 4.2.4 to 5.2.0 Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 4.2.4 to 5.2.0. - [Release notes](https://github.com/thoughtbot/paperclip/releases) - [Changelog](https://github.com/thoughtbot/paperclip/blob/master/NEWS) - [Commits](https://github.com/thoughtbot/paperclip/compare/v4.2.4...v5.2.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 37 ++++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) mode change 100755 => 100644 Gemfile diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index f91f23128..f834e68f5 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'responders', '~> 2.0' gem "jbuilder" gem 'jwt' gem 'rubyXL' -gem 'paperclip', '~> 4.2.0' +gem 'paperclip', '~> 5.2.0' gem "pg" gem "pry" # Needed for a smooth upgrade from Rails 3.2 to Rails 4.0 diff --git a/Gemfile.lock b/Gemfile.lock index ba1825e28..f0a66429e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,6 +43,9 @@ GEM activemodel (= 4.2.0) activesupport (= 4.2.0) arel (~> 6.0) + activerecord-postgis-adapter (3.1.5) + activerecord (~> 4.2) + rgeo-activerecord (>= 4.0.4) activesupport (4.2.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -66,7 +69,7 @@ GEM debug_inspector (>= 0.0.1) bootstrap3-datetimepicker-rails (4.17.47) momentjs-rails (>= 2.8.1) - builder (3.2.2) + builder (3.2.3) byebug (11.0.1) cancan (1.6.10) capybara (2.4.4) @@ -77,10 +80,9 @@ GEM xpath (~> 2.0) celluloid (0.16.0) timers (~> 4.0.0) - climate_control (0.0.3) - activesupport (>= 3.0) + climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.7) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.0) coffee-rails (4.1.0) @@ -90,6 +92,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) + concurrent-ruby (1.1.5) connection_pool (2.2.0) dalli (2.7.4) database_cleaner (1.4.1) @@ -133,7 +136,8 @@ GEM heapy (0.1.3) hitimes (1.2.2) http_accept_language (2.0.5) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) @@ -141,7 +145,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) jwt (1.4.1) kgio (2.9.3) launchy (2.4.3) @@ -157,9 +161,10 @@ GEM memcachier (0.0.2) memory_profiler (0.9.10) method_source (0.8.2) - mime-types (2.6.1) + mime-types (2.99.3) + mimemagic (0.3.3) mini_portile (0.6.2) - minitest (5.8.0) + minitest (5.11.3) momentjs-rails (2.20.1) railties (>= 3.1) multi_json (1.11.2) @@ -170,11 +175,12 @@ GEM notiffany (0.0.7) nenv (~> 0.1) shellany (~> 0.0) - paperclip (4.2.4) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.2.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types + mimemagic (~> 0.3.0) pg (0.18.2) poltergeist (1.6.0) capybara (~> 2.1) @@ -245,6 +251,10 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) + rgeo (0.6.0) + rgeo-activerecord (4.0.5) + activerecord (~> 4.2) + rgeo (~> 0.3) rollbar (2.2.1) roo (2.1.1) nokogiri (~> 1) @@ -303,7 +313,7 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) thor (0.19.1) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (1.4.1) timecop (0.7.3) timers (4.0.1) @@ -329,6 +339,7 @@ PLATFORMS ruby DEPENDENCIES + activerecord-postgis-adapter (~> 3.1.5) analytics-ruby (~> 2.0.8) angularjs-rails (~> 1.4.8) aws-sdk (< 2.0) @@ -358,7 +369,7 @@ DEPENDENCIES memcachier momentjs-rails newrelic_rpm - paperclip (~> 4.2.0) + paperclip (~> 5.2.0) pg poltergeist protected_attributes