aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-02-01 13:39:00 +0100
committerAlban Peignier2018-02-01 13:39:00 +0100
commit972e988e0f52a6ee69bf97c112be28e6f852be00 (patch)
tree52ad009546e2926a27e485643b08547534607182
parentc344768e619664d6876ddebca8c4ef474d11a402 (diff)
downloadchouette-core-972e988e0f52a6ee69bf97c112be28e6f852be00.tar.bz2
Revert webpacker to 3.0.2. Refs #5807
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock6
2 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index c378820b3..e1943e659 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
+# coding: utf-8
source 'https://rubygems.org'
# Use https for github
@@ -15,7 +16,7 @@ gem 'uglifier', '~> 2.7.2'
gem 'coffee-rails', '~> 4.0.0'
# Webpacker
-gem 'webpacker', '~> 3.0'
+gem 'webpacker', '3.0.2'
# Use jquery as the JavaScript library
gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2
diff --git a/Gemfile.lock b/Gemfile.lock
index ba86a911f..3a2314857 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -562,7 +562,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpacker (3.2.1)
+ webpacker (3.0.2)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
@@ -698,10 +698,10 @@ DEPENDENCIES
transpec
uglifier (~> 2.7.2)
webmock
- webpacker (~> 3.0)
+ webpacker (= 3.0.2)
whenever!
will_paginate
will_paginate-bootstrap
BUNDLED WITH
- 1.16.0
+ 1.16.1