zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

migrate to sinatra 4 / rack 3 (breaks current session cookies)

Browse source
This commit is contained in:
Kyle Drake 2025-01-31 16:15:14 -06:00
parent cf712b7175
commit f7c367b939
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -12,7 +12,7 @@ gem 'sidekiq', '~> 7'
gem 'mail' gem 'mail'
gem 'net-smtp' gem 'net-smtp'
gem 'tilt' gem 'tilt'
gem 'erubis' gem 'erubi'
gem 'stripe' #, source: 'https://code.stripe.com/' gem 'stripe' #, source: 'https://code.stripe.com/'
gem 'terrapin' gem 'terrapin'
gem 'sass', require: nil gem 'sass', require: nil

27
Gemfile.lock
View file

@ -70,7 +70,7 @@ GEM
domain_name (0.6.20231109) domain_name (0.6.20231109)
drb (2.2.0) drb (2.2.0)
ruby2_keywords ruby2_keywords
erubis (2.7.0) erubi (1.13.1)
exifr (1.4.0) exifr (1.4.0)
fabrication (2.31.0) fabrication (2.31.0)
facter (4.5.1) facter (4.5.1)
@ -156,6 +156,7 @@ GEM
llhttp-ffi (0.4.0) llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0) ffi-compiler (~> 1.0)
rake (~> 13.0) rake (~> 13.0)
logger (1.6.5)
loofah (2.22.0) loofah (2.22.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.12.0) nokogiri (>= 1.12.0)
@ -201,7 +202,7 @@ GEM
msgpack (1.7.2) msgpack (1.7.2)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.3.0) multipart-post (2.3.0)
mustermann (3.0.0) mustermann (3.0.3)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0) mutex_m (0.2.0)
net-imap (0.4.9) net-imap (0.4.9)
@ -229,12 +230,16 @@ GEM
puma (6.4.3) puma (6.4.3)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.7.3) racc (1.7.3)
rack (2.2.9) rack (3.1.9)
rack-cache (1.15.0) rack-cache (1.15.0)
rack (>= 0.4) rack (>= 0.4)
rack-protection (3.2.0) rack-protection (4.1.1)
base64 (>= 0.1.0) base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4) logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.1.0) rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rack_session_access (0.2.0) rack_session_access (0.2.0)
@ -296,10 +301,12 @@ GEM
simplecov_json_formatter (0.1.4) simplecov_json_formatter (0.1.4)
simpleidn (0.2.1) simpleidn (0.2.1)
unf (~> 0.1.4) unf (~> 0.1.4)
sinatra (3.2.0) sinatra (4.1.1)
logger (>= 1.6.0)
mustermann (~> 3.0) mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4) rack (>= 3.0.0, < 4)
rack-protection (= 3.2.0) rack-protection (= 4.1.1)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0) tilt (~> 2.0)
sinatra-flash (0.3.0) sinatra-flash (0.3.0)
sinatra (>= 1.0.0) sinatra (>= 1.0.0)
@ -317,7 +324,7 @@ GEM
climate_control climate_control
thor (1.3.0) thor (1.3.0)
thread (0.2.2) thread (0.2.2)
tilt (2.3.0) tilt (2.6.0)
timecop (0.9.8) timecop (0.9.8)
timeout (0.4.1) timeout (0.4.1)
tins (1.32.1) tins (1.32.1)
@ -363,7 +370,7 @@ DEPENDENCIES
coveralls_reborn coveralls_reborn
dav4rack! dav4rack!
dnsbl-client dnsbl-client
erubis erubi
fabrication fabrication
facter facter
faker faker

2
environment.rb
View file

@ -13,7 +13,7 @@ require 'logger'
Bundler.require Bundler.require
Bundler.require :development if ENV['RACK_ENV'] == 'development' Bundler.require :development if ENV['RACK_ENV'] == 'development'
require 'tilt/erubis' require 'tilt/erubi'
require 'active_support' require 'active_support'
require 'active_support/time' require 'active_support/time'