diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 17:57:17 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 17:57:17 +0100 |
| commit | d52e27f3dbf7a98844ba7091dcd49ad88083cd1a (patch) | |
| tree | 0693c57782c2d2e5f00a70b0ad7b84418b4368b3 | |
| parent | 64225f4ac2a922c27692e8326757ec8dc83a1cc8 (diff) | |
| parent | 5605b828e5149bd3a5161eb8d536ad51094afe64 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
| -rw-r--r-- | .env.test | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/webpack/tests.js (renamed from config/webpack/test.js) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.env.test b/.env.test index fa4e1d91f..761d0d921 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ # Node.js -NODE_ENV=test +NODE_ENV=tests # Federation LOCAL_DOMAIN=cb6e6126.ngrok.io LOCAL_HTTPS=true diff --git a/Gemfile b/Gemfile index 015a4d577..76eb05fc1 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem 'tty-command', '~> 0.9', require: false gem 'tty-prompt', '~> 0.19', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2019' -gem 'webpacker', '~> 4.0' +gem 'webpacker', '~> 4.2' gem 'webpush' gem 'json-ld', git: 'https://github.com/ruby-rdf/json-ld.git', ref: 'e742697a0906e74e8bb777ef98137bc3955d981d' diff --git a/Gemfile.lock b/Gemfile.lock index bc84b7dee..b152003b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -663,7 +663,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.0.7) + webpacker (4.2.0) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -805,7 +805,7 @@ DEPENDENCIES twitter-text (~> 1.14) tzinfo-data (~> 1.2019) webmock (~> 3.7) - webpacker (~> 4.0) + webpacker (~> 4.2) webpush RUBY VERSION diff --git a/config/webpack/test.js b/config/webpack/tests.js index f91244587..f91244587 100644 --- a/config/webpack/test.js +++ b/config/webpack/tests.js |