From 2997296127f7b860f7012d644503b338cb8547c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 21:46:15 +0000
Subject: [PATCH] Bump dragonfly from 0.9.8 to 1.4.0

Bumps [dragonfly](https://github.com/markevans/dragonfly) from 0.9.8 to 1.4.0.
- [Release notes](https://github.com/markevans/dragonfly/releases)
- [Changelog](https://github.com/markevans/dragonfly/blob/master/History.md)
- [Commits](https://github.com/markevans/dragonfly/compare/v0.9.8...v1.4.0)

---
updated-dependencies:
- dependency-name: dragonfly
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index c69f011f..abf28238 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'sunspot_rails',  '~> 1.3.3'
 gem 'active_hash' # 用于保存配置型(枚举)记录
 gem 'kaminari' # 分页
 #用于处理图片(缩略图)
-gem 'dragonfly', ' ~> 0.9.8'
+gem 'dragonfly', '~> 1.4.0'
 gem 'rack-cache', require: 'rack/cache'
 gem 'liquid','~> 2.3.0' #模板语言
 gem "carrierwave", '~> 0.6.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b4485d6..c5935c0f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,8 @@ GEM
     activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (3.0.2)
     awesome_print (1.0.2)
     bcrypt-ruby (3.0.1)
@@ -143,13 +144,15 @@ GEM
     diff-lcs (1.1.3)
     doorkeeper (0.4.0)
       railties (~> 3.1)
-    dragonfly (0.9.8)
-      rack
-    em-websocket (0.3.6)
-      addressable (>= 2.1.1)
+    dragonfly (1.4.0)
+      addressable (~> 2.3)
+      multi_json (~> 1.0)
+      rack (>= 1.3)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (0.12.10)
+    eventmachine (1.2.7)
     exception_notification (2.6.1)
       actionmailer (>= 3.0.4)
     execjs (1.4.0)
@@ -184,6 +187,7 @@ GEM
     has_scope (0.5.1)
     highline (1.6.13)
     hike (1.2.1)
+    http_parser.rb (0.6.0)
     httparty (0.7.8)
       crack (= 0.1.8)
     httpauth (0.1)
@@ -204,12 +208,13 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.6.0)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
-    libwebsocket (0.1.5)
+    libwebsocket (0.1.8)
       addressable
+      websocket
     liquid (2.3.0)
     listen (0.4.6)
       rb-fchange (~> 0.0.5)
@@ -259,12 +264,13 @@ GEM
     polyglot (0.3.3)
     posix-spawn (0.3.6)
     pr_geohash (1.0.0)
+    public_suffix (4.0.6)
     pygments.rb (0.2.4)
       rubypython (~> 0.5.3)
     rabl (0.6.13)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
-    rack (1.4.1)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-protection (1.2.0)
@@ -406,6 +412,7 @@ GEM
     webmock (1.7.10)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
+    websocket (1.2.9)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -431,7 +438,7 @@ DEPENDENCIES
   default_value_for
   devise (~> 2.1.2)
   doorkeeper (~> 0.4.0)
-  dragonfly (~> 0.9.8)
+  dragonfly (~> 1.4.0)
   exception_notification
   factory_girl
   factory_girl_rails