aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock22
1 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c93085395..19de9bc22b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -285,7 +285,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- loofah (2.1.1)
+ loofah (2.2.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
@@ -319,17 +319,17 @@ GEM
multipart-post (2.0.0)
mustache (1.0.5)
mustermann (1.0.2)
- mysql2 (0.4.10)
- mysql2 (0.4.10-x64-mingw32)
- mysql2 (0.4.10-x86-mingw32)
+ mysql2 (0.5.0)
+ mysql2 (0.5.0-x64-mingw32)
+ mysql2 (0.5.0-x86-mingw32)
nio4r (2.2.0)
nio4r (2.2.0-java)
- nokogiri (1.8.1)
+ nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
- nokogiri (1.8.1-java)
- nokogiri (1.8.1-x64-mingw32)
+ nokogiri (1.8.2-java)
+ nokogiri (1.8.2-x64-mingw32)
mini_portile2 (~> 2.3.0)
- nokogiri (1.8.1-x86-mingw32)
+ nokogiri (1.8.2-x86-mingw32)
mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.1)
@@ -340,7 +340,7 @@ GEM
pg (1.0.0-x64-mingw32)
pg (1.0.0-x86-mingw32)
powerpack (0.1.1)
- psych (2.2.4)
+ psych (3.0.2)
public_suffix (3.0.1)
puma (3.9.1)
puma (3.9.1-java)
@@ -510,7 +510,7 @@ DEPENDENCIES
chromedriver-helper
coffee-rails
connection_pool
- dalli (>= 2.2.1)
+ dalli (< 2.7.7)
delayed_job
delayed_job_active_record
google-cloud-storage (~> 1.8)
@@ -525,7 +525,7 @@ DEPENDENCIES
mysql2 (>= 0.4.10)
nokogiri (>= 1.8.1)
pg (>= 0.18.0)
- psych (~> 2.0)
+ psych (~> 3.0)
puma
que
queue_classic!