zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-03 00:02:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix for gemfile, merge conflicts, test fixes for ruby 3

Browse source
This commit is contained in:
Kyle Drake 2022-11-05 12:46:43 -05:00
commit e7eb6d8a2d
36 changed files with 785 additions and 764 deletions
Download patch file Download diff file Expand all files Collapse all files

5
models/site.rb
View file

@ -766,10 +766,11 @@ class Site < Sequel::Model
purge_cache path
end
Rye::Cmd.add_command :ipfs
#Rye::Cmd.add_command :ipfs
def add_to_ipfs
# Not ideal. An SoA version is in progress.
return nil
if archives_dataset.count > Archive::MAXIMUM_ARCHIVES_PER_SITE
archives_dataset.order(:updated_at).first.destroy
@ -836,7 +837,7 @@ class Site < Sequel::Model
path = scrubbed_path path
relative_path = files_path path
if Dir.exists?(relative_path) || File.exist?(relative_path)
if Dir.exist?(relative_path) || File.exist?(relative_path)
return 'Directory (or file) already exists.'
end