aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorLuc Donnet2018-02-09 12:11:24 +0100
committerGitHub2018-02-09 12:11:24 +0100
commita68053c85fdb55e43fdf1ae7d9aba95e31a148bb (patch)
tree9e5f38bad3645abe78cee7758e9ec549978cf4f8 /Gemfile.lock
parentcbab2b01c2ad462d7433cc7dd35423527c68871a (diff)
parent54c4cd2ddb23e3acf756881c23e78cf61d23e1a6 (diff)
downloadchouette-core-a68053c85fdb55e43fdf1ae7d9aba95e31a148bb.tar.bz2
Merge pull request #296 from af83/5807-update-webpacker
5807 update webpacker
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d957b06b..2988f6e8f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
htmlbeautifier (1.3.1)
httparty (0.14.0)
multi_xml (>= 0.5.2)
- i18n (0.9.3)
+ i18n (0.9.4)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.15)
activesupport (>= 4.0.2)
@@ -318,7 +318,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_portile2 (2.3.0)
- minitest (5.11.2)
+ minitest (5.11.3)
money (6.10.1)
i18n (>= 0.6.4, < 1.0)
multi_json (1.12.1)
@@ -559,7 +559,7 @@ GEM
json (>= 1.8, < 3.0)
parser (>= 2.3.0.7)
rainbow (>= 1.99.1, < 3.0)
- tzinfo (1.2.4)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
@@ -572,7 +572,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpacker (3.0.2)
+ webpacker (3.2.1)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
@@ -710,7 +710,7 @@ DEPENDENCIES
transpec
uglifier (~> 2.7.2)
webmock
- webpacker (= 3.0.2)
+ webpacker (= 3.2.1)
whenever!
will_paginate
will_paginate-bootstrap