Skip to content

Commit 33d82e6

Browse files
authored
Merge pull request #369 from plural/update-rack-to-3.1
Update rack to 3.1. Update rspec_api_documentation to compatible fork.
2 parents 516104a + 02a011a commit 33d82e6

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

Gemfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ gem 'parslet'
2222
# Reduces boot times through caching; required in config/boot.rb
2323
gem 'bootsnap', require: false
2424

25-
gem 'rack', '~> 2.2'
25+
gem 'rack', '~> 3.1'
2626
# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
27-
gem 'rack-cors', '2.0.0'
27+
gem 'rack-cors'
2828

2929
# Used for our import of the card data.
3030
gem 'activerecord-import'
@@ -41,7 +41,8 @@ gem 'scenic'
4141

4242
gem 'apitome'
4343
gem 'jwt'
44-
gem 'rspec_api_documentation'
44+
# Specific fork to deal with rack 3.1 compatibility issue.
45+
gem 'rspec_api_documentation', github: 'SchoolKeep/rspec_api_documentation', ref: '13df1ac'
4546
gem 'sprockets-rails'
4647

4748
# Observability and monitoring via OpenTelemetry.

Gemfile.lock

+20-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
GIT
2+
remote: https://github.com/SchoolKeep/rspec_api_documentation.git
3+
revision: 13df1acbcacf730468b6cfd2bae56e3c0d1a5b3a
4+
ref: 13df1ac
5+
specs:
6+
rspec_api_documentation (6.1.0)
7+
activesupport (>= 3.0.0)
8+
mustache (~> 1.0, >= 0.99.4)
9+
rspec (~> 3.0)
10+
111
GEM
212
remote: https://rubygems.org/
313
specs:
@@ -430,16 +440,16 @@ GEM
430440
puma (6.6.0)
431441
nio4r (~> 2.0)
432442
racc (1.8.1)
433-
rack (2.2.13)
434-
rack-cors (2.0.0)
443+
rack (3.1.12)
444+
rack-cors (2.0.2)
435445
rack (>= 2.0.0)
436-
rack-session (1.0.2)
437-
rack (< 3)
446+
rack-session (2.1.0)
447+
base64 (>= 0.1.0)
448+
rack (>= 3.0.0)
438449
rack-test (2.2.0)
439450
rack (>= 1.3)
440-
rackup (1.0.1)
441-
rack (< 3)
442-
webrick
451+
rackup (2.2.1)
452+
rack (>= 3)
443453
rails (7.2.2.1)
444454
actioncable (= 7.2.2.1)
445455
actionmailbox (= 7.2.2.1)
@@ -505,10 +515,6 @@ GEM
505515
rspec-mocks (~> 3.13)
506516
rspec-support (~> 3.13)
507517
rspec-support (3.13.2)
508-
rspec_api_documentation (6.1.0)
509-
activesupport (>= 3.0.0)
510-
mustache (~> 1.0, >= 0.99.4)
511-
rspec (~> 3.0)
512518
rubocop (1.74.0)
513519
json (~> 2.3)
514520
language_server-protocol (~> 3.17.0.2)
@@ -569,7 +575,6 @@ GEM
569575
unicode-emoji (4.0.4)
570576
uniform_notifier (1.16.0)
571577
useragent (0.16.11)
572-
webrick (1.9.1)
573578
websocket-driver (0.7.7)
574579
base64
575580
websocket-extensions (>= 0.1.0)
@@ -606,13 +611,13 @@ DEPENDENCIES
606611
parslet
607612
pg (~> 1.1)
608613
puma (~> 6.4)
609-
rack (~> 2.2)
610-
rack-cors (= 2.0.0)
614+
rack (~> 3.1)
615+
rack-cors
611616
rails (~> 7)
612617
responders
613618
reverse_markdown
614619
rspec-rails
615-
rspec_api_documentation
620+
rspec_api_documentation!
616621
rubocop
617622
rubocop-factory_bot
618623
rubocop-rails

0 commit comments

Comments
 (0)