Skip to content

Commit 1501ef9

Browse files
authored
Merge pull request #278 from restarone/dependencyBump
upgrade dependencies for version 0.5 => 0.5.1
2 parents f2eb3fe + 4fe0bb6 commit 1501ef9

File tree

3 files changed

+59
-49
lines changed

3 files changed

+59
-49
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'rails', '~> 6.1.3', '>= 6.1.3.1'
88
# Use postgresql as the database for Active Record
99
gem 'pg', '~> 1.1'
1010
# Use Puma as the app server
11-
gem 'puma', '~> 5.0'
11+
gem 'puma', '~> 5.3'
1212
# Use SCSS for stylesheets
1313
gem 'sass-rails', '>= 6'
1414
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker

Gemfile.lock

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GEM
100100
minitest (>= 5.1)
101101
tzinfo (~> 2.0)
102102
zeitwerk (~> 2.3)
103-
addressable (2.7.0)
103+
addressable (2.8.0)
104104
public_suffix (>= 2.0.2, < 5.0)
105105
ahoy_matey (3.2.0)
106106
activesupport (>= 5)
@@ -262,26 +262,31 @@ GEM
262262
rake
263263
mini_magick (4.11.0)
264264
mini_mime (1.0.3)
265-
mini_portile2 (2.5.0)
265+
mini_portile2 (2.5.2)
266+
net-ftp (~> 0.1)
266267
minitest (5.14.4)
267268
mocha (1.12.0)
268269
msgpack (1.4.2)
269270
multi_xml (0.6.0)
270271
mustermann (1.1.1)
271272
ruby2_keywords (~> 0.0.1)
273+
net-ftp (0.1.2)
274+
net-protocol
275+
time
276+
net-protocol (0.1.0)
272277
net-scp (3.0.0)
273278
net-ssh (>= 2.6.5, < 7.0.0)
274279
net-ssh (6.1.0)
275280
netrc (0.11.0)
276281
nio4r (2.5.7)
277-
nokogiri (1.11.2)
282+
nokogiri (1.11.6)
278283
mini_portile2 (~> 2.5.0)
279284
racc (~> 1.4)
280285
orm_adapter (0.5.0)
281286
parallel (1.20.1)
282287
pg (1.2.3)
283288
public_suffix (4.0.6)
284-
puma (5.2.2)
289+
puma (5.3.1)
285290
nio4r (~> 2.0)
286291
racc (1.5.2)
287292
rack (2.2.3)
@@ -411,6 +416,7 @@ GEM
411416
temple (0.8.2)
412417
thor (1.1.0)
413418
tilt (2.0.10)
419+
time (0.1.0)
414420
turbolinks (5.2.1)
415421
turbolinks-source (~> 5.2)
416422
turbolinks-source (5.2.0)
@@ -484,7 +490,7 @@ DEPENDENCIES
484490
meta-tags
485491
mocha
486492
pg (~> 1.1)
487-
puma (~> 5.0)
493+
puma (~> 5.3)
488494
rack-cors
489495
rack-mini-profiler (~> 2.0)
490496
rails (~> 6.1.3, >= 6.1.3.1)

yarn.lock

Lines changed: 47 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)