Skip to content

Commit a05deb4

Browse files
committed
Merge branch 'master' of github.com:indentlabs/notebook
2 parents 11752ab + afbe30e commit a05deb4

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ruby "~> 2.7"
33

44
# Server
55
gem 'rails'
6-
gem 'puma', '~> 5.1'
6+
gem 'puma', '~> 5.2'
77
gem 'puma-heroku'
88
# gem 'bootsnap', require: false
99
gem 'sprockets', '~> 3.7.2'

Gemfile.lock

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ GEM
110110
public_suffix (>= 2.0.2, < 5.0)
111111
animate-rails (1.0.10)
112112
rails
113-
ast (2.4.1)
113+
ast (2.4.2)
114114
authority (3.3.0)
115115
activesupport (>= 3.0.0)
116116
autoprefixer-rails (9.8.4)
117117
execjs
118118
aws-eventstream (1.1.0)
119-
aws-partitions (1.418.0)
119+
aws-partitions (1.429.0)
120120
aws-sdk (3.0.1)
121121
aws-sdk-resources (~> 3)
122122
aws-sdk-accessanalyzer (1.1.0)
@@ -275,7 +275,7 @@ GEM
275275
aws-sdk-connectparticipant (1.0.0)
276276
aws-sdk-core (~> 3, >= 3.71.0)
277277
aws-sigv4 (~> 1.1)
278-
aws-sdk-core (3.111.2)
278+
aws-sdk-core (3.112.0)
279279
aws-eventstream (~> 1, >= 1.0.2)
280280
aws-partitions (~> 1, >= 1.239.0)
281281
aws-sigv4 (~> 1.1)
@@ -484,8 +484,8 @@ GEM
484484
aws-sdk-kinesisvideosignalingchannels (1.0.0)
485485
aws-sdk-core (~> 3, >= 3.71.0)
486486
aws-sigv4 (~> 1.1)
487-
aws-sdk-kms (1.41.0)
488-
aws-sdk-core (~> 3, >= 3.109.0)
487+
aws-sdk-kms (1.42.0)
488+
aws-sdk-core (~> 3, >= 3.112.0)
489489
aws-sigv4 (~> 1.1)
490490
aws-sdk-lakeformation (1.1.0)
491491
aws-sdk-core (~> 3, >= 3.71.0)
@@ -875,8 +875,8 @@ GEM
875875
aws-sdk-route53resolver (1.11.0)
876876
aws-sdk-core (~> 3, >= 3.71.0)
877877
aws-sigv4 (~> 1.1)
878-
aws-sdk-s3 (1.87.0)
879-
aws-sdk-core (~> 3, >= 3.109.0)
878+
aws-sdk-s3 (1.89.0)
879+
aws-sdk-core (~> 3, >= 3.112.0)
880880
aws-sdk-kms (~> 1)
881881
aws-sigv4 (~> 1.1)
882882
aws-sdk-s3control (1.14.0)
@@ -1027,13 +1027,13 @@ GEM
10271027
bundler-audit (0.7.0.1)
10281028
bundler (>= 1.2.0, < 3)
10291029
thor (>= 0.18, < 2)
1030-
capybara (3.34.0)
1030+
capybara (3.35.3)
10311031
addressable
10321032
mini_mime (>= 0.1.3)
10331033
nokogiri (~> 1.8)
10341034
rack (>= 1.6.0)
10351035
rack-test (>= 0.6.3)
1036-
regexp_parser (~> 1.5)
1036+
regexp_parser (>= 1.5, < 3.0)
10371037
xpath (~> 3.2)
10381038
chartkick (3.4.2)
10391039
childprocess (3.0.0)
@@ -1094,7 +1094,12 @@ GEM
10941094
cucumber-messages (~> 13.0, >= 13.0.1)
10951095
d3-rails (5.9.2)
10961096
railties (>= 3.1)
1097-
database_cleaner (1.8.5)
1097+
database_cleaner (2.0.1)
1098+
database_cleaner-active_record (~> 2.0.0)
1099+
database_cleaner-active_record (2.0.0)
1100+
activerecord (>= 5.a)
1101+
database_cleaner-core (~> 2.0.0)
1102+
database_cleaner-core (2.0.1)
10981103
dateslices (0.0.4)
10991104
rails (> 4)
11001105
db_text_search (0.3.1)
@@ -1179,10 +1184,10 @@ GEM
11791184
concurrent-ruby (~> 1.0)
11801185
http (~> 4.1.0)
11811186
jwt (~> 2.2.1)
1182-
ibm_watson (1.6.0)
1187+
ibm_watson (2.0.1)
11831188
concurrent-ruby (~> 1.0)
11841189
eventmachine (~> 1.2)
1185-
faye-websocket (~> 0.10)
1190+
faye-websocket (~> 0.11)
11861191
http (~> 4.1.0)
11871192
ibm_cloud_sdk_core (~> 1.1.1)
11881193
jwt (~> 2.2.1)
@@ -1257,7 +1262,7 @@ GEM
12571262
nenv (0.3.0)
12581263
nested_form (0.3.2)
12591264
newrelic_rpm (6.15.0)
1260-
nio4r (2.5.4)
1265+
nio4r (2.5.5)
12611266
nokogiri (1.11.1)
12621267
mini_portile2 (~> 2.5.0)
12631268
racc (~> 1.4)
@@ -1302,15 +1307,15 @@ GEM
13021307
coderay (~> 1.1)
13031308
method_source (~> 1.0)
13041309
public_suffix (4.0.6)
1305-
puma (5.1.1)
1310+
puma (5.2.2)
13061311
nio4r (~> 2.0)
13071312
puma-heroku (2.0.0)
13081313
puma (>= 5.0, < 6.0)
13091314
pundit (2.1.0)
13101315
activesupport (>= 3.0.0)
13111316
racc (1.5.2)
13121317
rack (2.2.3)
1313-
rack-mini-profiler (2.3.0)
1318+
rack-mini-profiler (2.3.1)
13141319
rack (>= 1.2.0)
13151320
rack-pjax (1.1.0)
13161321
nokogiri (~> 1.5)
@@ -1385,7 +1390,7 @@ GEM
13851390
tilt
13861391
redcarpet (3.5.1)
13871392
redis (4.2.5)
1388-
regexp_parser (1.8.2)
1393+
regexp_parser (2.0.3)
13891394
remotipart (1.4.4)
13901395
responders (3.0.1)
13911396
actionpack (>= 5.0)
@@ -1417,7 +1422,7 @@ GEM
14171422
rspec-mocks (~> 3.10)
14181423
rspec-support (~> 3.10)
14191424
rspec-support (3.10.1)
1420-
rubocop (1.8.1)
1425+
rubocop (1.11.0)
14211426
parallel (~> 1.10)
14221427
parser (>= 3.0.0.0)
14231428
rainbow (>= 2.2.2, < 4.0)
@@ -1426,7 +1431,7 @@ GEM
14261431
rubocop-ast (>= 1.2.0, < 2.0)
14271432
ruby-progressbar (~> 1.7)
14281433
unicode-display_width (>= 1.4.0, < 3.0)
1429-
rubocop-ast (1.4.0)
1434+
rubocop-ast (1.4.1)
14301435
parser (>= 2.7.1.5)
14311436
ruby-prof (1.4.2)
14321437
ruby-progressbar (1.11.0)
@@ -1513,7 +1518,7 @@ GEM
15131518
activemodel (>= 6.0.0)
15141519
bindex (>= 0.4.0)
15151520
railties (>= 6.0.0)
1516-
webmock (3.11.1)
1521+
webmock (3.12.1)
15171522
addressable (>= 2.3.6)
15181523
crack (>= 0.3.2)
15191524
hashdiff (>= 0.4.0, < 2.0.0)
@@ -1583,7 +1588,7 @@ DEPENDENCIES
15831588
paypal_client
15841589
pg (~> 1.2)
15851590
pry
1586-
puma (~> 5.1)
1591+
puma (~> 5.2)
15871592
puma-heroku
15881593
rack-mini-profiler
15891594
rails

0 commit comments

Comments
 (0)