Skip to content

Commit d9f3712

Browse files
usiegj00usiegj00
authored
Merge branch 'master' into dependabot/bundler/rack-2.0.8
2 parents 3078de4 + 67e3363 commit d9f3712

File tree

3 files changed

+76
-52
lines changed

3 files changed

+76
-52
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ gem 'mailgun-ruby'
2828
gem 'meta-tags'
2929
gem 'mini_magick'
3030
gem 'mini_racer'
31-
gem 'nokogiri', '~> 1.8.2'
31+
gem 'nokogiri', '~> 1.10.8'
3232
gem 'pg', '~> 0.15'
3333
gem 'poltergeist'
3434
gem 'puma'

‎Gemfile.lock

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ GEM
6363
blankslate (3.1.3)
6464
browser (2.4.0)
6565
bugsnag (5.3.2)
66-
builder (3.2.3)
66+
builder (3.2.4)
6767
byebug (9.0.6)
6868
capybara (2.14.0)
6969
addressable
@@ -97,20 +97,21 @@ GEM
9797
coffee-script-source
9898
execjs
9999
coffee-script-source (1.12.2)
100-
concurrent-ruby (1.1.5)
100+
concurrent-ruby (1.1.6)
101101
connection_pool (2.2.1)
102-
crass (1.0.5)
102+
crass (1.0.6)
103103
dalli (2.7.6)
104104
derailed (0.1.0)
105105
derailed_benchmarks
106-
derailed_benchmarks (1.3.2)
106+
derailed_benchmarks (1.6.0)
107107
benchmark-ips (~> 2)
108108
get_process_mem (~> 0)
109109
heapy (~> 0)
110110
memory_profiler (~> 0)
111111
rack (>= 1)
112-
rake (> 10, < 13)
113-
thor (~> 0.19)
112+
rake (> 10, < 14)
113+
ruby-statistics (>= 2.1)
114+
thor (>= 0.19, < 2)
114115
domain_name (0.5.20170404)
115116
unf (>= 0.0.5, < 1.0.0)
116117
dotenv (2.2.1)
@@ -135,9 +136,11 @@ GEM
135136
i18n (~> 0.5)
136137
faraday (0.12.1)
137138
multipart-post (>= 1.2, < 3)
139+
ffi (1.12.2)
138140
friendly_id (5.2.1)
139141
activerecord (>= 4.0.0)
140-
get_process_mem (0.2.1)
142+
get_process_mem (0.2.5)
143+
ffi (~> 1.0)
141144
globalid (0.4.1)
142145
activesupport (>= 4.2.0)
143146
green_monkey (0.3.0)
@@ -153,7 +156,7 @@ GEM
153156
haml (>= 4.0.6, < 6.0)
154157
html2haml (>= 1.0.1)
155158
railties (>= 4.0.1)
156-
heapy (0.1.3)
159+
heapy (0.1.4)
157160
html2haml (2.2.0)
158161
erubis (~> 2.7.0)
159162
haml (>= 4.0, < 6)
@@ -209,10 +212,10 @@ GEM
209212
mini_mime (>= 0.1.1)
210213
mailgun-ruby (1.1.6)
211214
rest-client (~> 2.0)
212-
memory_profiler (0.9.10)
215+
memory_profiler (0.9.14)
213216
meta-tags (2.4.1)
214217
actionpack (>= 3.2.0, < 5.2)
215-
method_source (0.9.0)
218+
method_source (0.9.2)
216219
mida_vocabulary (0.2.2)
217220
blankslate (~> 3.1)
218221
mime-types (3.1)
@@ -221,16 +224,16 @@ GEM
221224
mimemagic (0.3.2)
222225
mini_magick (4.7.0)
223226
mini_mime (1.0.0)
224-
mini_portile2 (2.3.0)
227+
mini_portile2 (2.4.0)
225228
mini_racer (0.2.0)
226229
libv8 (>= 6.3)
227-
minitest (5.13.0)
230+
minitest (5.14.0)
228231
multi_json (1.14.1)
229232
multipart-post (2.0.0)
230233
netrc (0.11.0)
231234
nio4r (2.3.1)
232-
nokogiri (1.8.4)
233-
mini_portile2 (~> 2.3.0)
235+
nokogiri (1.10.8)
236+
mini_portile2 (~> 2.4.0)
234237
numerizer (0.1.1)
235238
parallel (1.11.2)
236239
parser (2.4.0.0)
@@ -242,7 +245,7 @@ GEM
242245
websocket-driver (>= 0.2.0)
243246
powerpack (0.1.1)
244247
public_suffix (2.0.5)
245-
puma (3.12.2)
248+
puma (3.12.4)
246249
puma_worker_killer (0.1.0)
247250
get_process_mem (~> 0.2)
248251
puma (>= 2.7, < 4)
@@ -251,7 +254,7 @@ GEM
251254
multi_json (~> 1.0)
252255
pusher-signature (~> 0.1.8)
253256
pusher-signature (0.1.8)
254-
rack (2.0.8)
257+
rack (2.2.2)
255258
rack-cors (1.0.5)
256259
rack (>= 1.6.0)
257260
rack-mini-profiler (0.10.5)
@@ -278,8 +281,8 @@ GEM
278281
rails-dom-testing (2.0.3)
279282
activesupport (>= 4.2.0)
280283
nokogiri (>= 1.6)
281-
rails-html-sanitizer (1.0.4)
282-
loofah (~> 2.2, >= 2.2.2)
284+
rails-html-sanitizer (1.3.0)
285+
loofah (~> 2.3)
283286
rails_12factor (0.0.3)
284287
rails_serve_static_assets
285288
rails_stdout_logging
@@ -293,7 +296,7 @@ GEM
293296
thor (>= 0.18.1, < 2.0)
294297
rainbow (2.2.2)
295298
rake
296-
rake (12.3.1)
299+
rake (13.0.1)
297300
react_on_rails (8.0.1)
298301
addressable
299302
connection_pool
@@ -316,6 +319,7 @@ GEM
316319
ruby-progressbar (~> 1.7)
317320
unicode-display_width (~> 1.0, >= 1.0.1)
318321
ruby-progressbar (1.8.1)
322+
ruby-statistics (2.1.1)
319323
ruby_parser (3.9.0)
320324
sexp_processor (~> 4.1)
321325
sass (3.4.24)
@@ -347,7 +351,7 @@ GEM
347351
stripe (2.11.0)
348352
faraday (~> 0.9)
349353
temple (0.8.0)
350-
thor (0.20.0)
354+
thor (1.0.1)
351355
thread_safe (0.3.6)
352356
tilt (2.0.7)
353357
timecop (0.8.1)
@@ -356,7 +360,7 @@ GEM
356360
turbolinks (5.0.1)
357361
turbolinks-source (~> 5)
358362
turbolinks-source (5.0.3)
359-
tzinfo (1.2.5)
363+
tzinfo (1.2.6)
360364
thread_safe (~> 0.1)
361365
uglifier (3.2.0)
362366
execjs (>= 0.3.0, < 3)
@@ -371,7 +375,7 @@ GEM
371375
railties (>= 5.0)
372376
websocket-driver (0.6.5)
373377
websocket-extensions (>= 0.1.0)
374-
websocket-extensions (0.1.3)
378+
websocket-extensions (0.1.5)
375379
xpath (2.1.0)
376380
nokogiri (~> 1.3)
377381

@@ -413,7 +417,7 @@ DEPENDENCIES
413417
meta-tags
414418
mini_magick
415419
mini_racer
416-
nokogiri (~> 1.8.2)
420+
nokogiri (~> 1.10.8)
417421
pg (~> 0.15)
418422
poltergeist
419423
puma

‎client/yarn.lock

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
# yarn lockfile v1
33

44

5+
"@types/babel-types@*", "@types/babel-types@^7.0.0":
6+
version "7.0.7"
7+
resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.7.tgz#667eb1640e8039436028055737d2b9986ee336e3"
8+
9+
"@types/babylon@^6.16.2":
10+
version "6.16.5"
11+
resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.5.tgz#1c5641db69eb8cdf378edd25b4be7754beeb48b4"
12+
dependencies:
13+
"@types/babel-types" "*"
14+
515
CSSselect@~0.4.0:
616
version "0.4.1"
717
resolved "https://registry.yarnpkg.com/CSSselect/-/CSSselect-0.4.1.tgz#f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"
@@ -51,7 +61,7 @@ acorn-jsx@^3.0.0:
5161
dependencies:
5262
acorn "^3.0.4"
5363

54-
acorn@^3.0.0, acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
64+
acorn@^3.0.0, acorn@^3.0.4, acorn@^3.1.0:
5565
version "3.3.0"
5666
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
5767

@@ -1083,6 +1093,13 @@ babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
10831093
core-js "^2.4.0"
10841094
regenerator-runtime "^0.10.0"
10851095

1096+
babel-runtime@^6.26.0:
1097+
version "6.26.0"
1098+
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
1099+
dependencies:
1100+
core-js "^2.4.0"
1101+
regenerator-runtime "^0.11.0"
1102+
10861103
babel-template@^6.16.0, babel-template@^6.24.1:
10871104
version "6.24.1"
10881105
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
@@ -1107,18 +1124,18 @@ babel-traverse@^6.0.20, babel-traverse@^6.18.0, babel-traverse@^6.24.1:
11071124
invariant "^2.2.0"
11081125
lodash "^4.2.0"
11091126

1110-
babel-types@^6.0.19, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1:
1111-
version "6.24.1"
1112-
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
1127+
babel-types@^6.0.19, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
1128+
version "6.26.0"
1129+
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
11131130
dependencies:
1114-
babel-runtime "^6.22.0"
1131+
babel-runtime "^6.26.0"
11151132
esutils "^2.0.2"
1116-
lodash "^4.2.0"
1117-
to-fast-properties "^1.0.1"
1133+
lodash "^4.17.4"
1134+
to-fast-properties "^1.0.3"
11181135

1119-
babylon@^6.0.18, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
1120-
version "6.17.1"
1121-
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.1.tgz#17f14fddf361b695981fe679385e4f1c01ebd86f"
1136+
babylon@^6.0.18, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.18.0:
1137+
version "6.18.0"
1138+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
11221139

11231140
balanced-match@^0.4.1, balanced-match@^0.4.2:
11241141
version "0.4.2"
@@ -1693,11 +1710,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
16931710
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
16941711

16951712
constantinople@^3.0.1:
1696-
version "3.1.0"
1697-
resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
1713+
version "3.1.2"
1714+
resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
16981715
dependencies:
1699-
acorn "^3.1.0"
1700-
is-expression "^2.0.1"
1716+
"@types/babel-types" "^7.0.0"
1717+
"@types/babylon" "^6.16.2"
1718+
babel-types "^6.26.0"
1719+
babylon "^6.18.0"
17011720

17021721
constants-browserify@^1.0.0:
17031722
version "1.0.0"
@@ -1750,8 +1769,8 @@ core-js@^1.0.0:
17501769
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
17511770

17521771
core-js@^2.4.0:
1753-
version "2.4.1"
1754-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
1772+
version "2.6.11"
1773+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
17551774

17561775
core-util-is@~1.0.0:
17571776
version "1.0.2"
@@ -2512,10 +2531,14 @@ estraverse@~4.1.0:
25122531
version "4.1.1"
25132532
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
25142533

2515-
esutils@^2.0.0, esutils@^2.0.2:
2534+
esutils@^2.0.0:
25162535
version "2.0.2"
25172536
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
25182537

2538+
esutils@^2.0.2:
2539+
version "2.0.3"
2540+
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
2541+
25192542
etag@~1.8.1:
25202543
version "1.8.1"
25212544
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -3581,13 +3604,6 @@ is-expression@^1.0.0:
35813604
acorn "~2.7.0"
35823605
object-assign "^4.0.1"
35833606

3584-
is-expression@^2.0.1:
3585-
version "2.1.0"
3586-
resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
3587-
dependencies:
3588-
acorn "~3.3.0"
3589-
object-assign "^4.0.1"
3590-
35913607
is-extendable@^0.1.0, is-extendable@^0.1.1:
35923608
version "0.1.1"
35933609
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4432,7 +4448,7 @@ lodash@^4.0.0, lodash@^4.12.0, lodash@^4.14.0, lodash@^4.17.13, lodash@^4.2.0, l
44324448
version "4.17.13"
44334449
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
44344450

4435-
lodash@^4.17.14, lodash@^4.17.5:
4451+
lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5:
44364452
version "4.17.15"
44374453
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
44384454

@@ -6126,6 +6142,10 @@ regenerator-runtime@^0.10.0:
61266142
version "0.10.5"
61276143
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
61286144

6145+
regenerator-runtime@^0.11.0:
6146+
version "0.11.1"
6147+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
6148+
61296149
regenerator-transform@0.9.11:
61306150
version "0.9.11"
61316151
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
@@ -7021,7 +7041,7 @@ to-arraybuffer@^1.0.0:
70217041
version "1.0.1"
70227042
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
70237043

7024-
to-fast-properties@^1.0.1:
7044+
to-fast-properties@^1.0.3:
70257045
version "1.0.3"
70267046
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
70277047

@@ -7442,8 +7462,8 @@ websocket-driver@>=0.5.1:
74427462
websocket-extensions ">=0.1.1"
74437463

74447464
websocket-extensions@>=0.1.1:
7445-
version "0.1.1"
7446-
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
7465+
version "0.1.4"
7466+
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
74477467

74487468
whatwg-encoding@^1.0.1:
74497469
version "1.0.1"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy