diff --git a/Gemfile b/Gemfile index 54494bd8..6faffeb6 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,6 @@ gem "puma", "~> 5.0" # web server for development gem "rails", "~> 7.0.0" gem 'recaptcha' # prevent robots spamming the feedback form gem "sprockets-rails" # The original asset pipeline for Rails -gem "sqlite3", "~> 1.4" gem "stimulus-rails" # Hotwire's modest JavaScript framework gem 'tophat' gem "turbo-rails" # Hotwire's SPA-like page accelerator diff --git a/Gemfile.lock b/Gemfile.lock index 07727807..6225adea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -361,9 +361,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.8) - mini_portile2 (~> 2.8.0) - sqlite3 (1.6.8-x86_64-darwin) sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -440,7 +437,6 @@ DEPENDENCIES selenium-webdriver (!= 3.13.0) simplecov sprockets-rails - sqlite3 (~> 1.4) stimulus-rails tophat turbo-rails diff --git a/bin/setup b/bin/setup index bd1c6e59..d6475187 100755 --- a/bin/setup +++ b/bin/setup @@ -25,8 +25,8 @@ FileUtils.chdir APP_ROOT do # FileUtils.cp "config/database.yml.sample", "config/database.yml" # end - puts "\n== Preparing database ==" - system! "bin/rails db:prepare" + # puts "\n== Preparing database ==" + # system! "bin/rails db:prepare" puts "\n== Removing old logs and tempfiles ==" system! "bin/rails log:clear tmp:clear" diff --git a/config/application.rb b/config/application.rb index 5311ef17..6fa41900 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,6 +1,12 @@ require_relative "boot" -require "rails/all" +require "rails" +# Jut the frameworks we're using: +require "active_model/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "rails/test_unit/railtie" # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 025d62a8..00000000 --- a/config/database.yml +++ /dev/null @@ -1,22 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/config/environments/development.rb b/config/environments/development.rb index 8500f459..abb8008b 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,7 +34,7 @@ end # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + # config.active_storage.service = :local # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false diff --git a/config/environments/production.rb b/config/environments/production.rb index a6832d62..dbc24e9a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -38,7 +38,7 @@ # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + # config.active_storage.service = :local # Mount Action Cable outside main process or domain. # config.action_cable.mount_path = nil diff --git a/config/environments/test.rb b/config/environments/test.rb index 618aebdf..2d5c3ce8 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -34,7 +34,7 @@ config.action_controller.allow_forgery_protection = false # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test + # config.active_storage.service = :test config.action_mailer.perform_caching = false diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 11640ee6..bc88d48d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -29,7 +29,7 @@ # Checks for pending migrations before tests are run. # If you are not using ActiveRecord, you can remove this line. -ActiveRecord::Migration.maintain_test_schema! +# ActiveRecord::Migration.maintain_test_schema! RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures