From 2ebd73563b71f100036032d8a3ee8df8f564d6f1 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Tue, 12 Sep 2023 14:50:57 -0800 Subject: [PATCH 1/4] postgres db configuration --- .gitignore | 4 ---- app/controllers/application_controller.rb | 1 - config/database.yml | 12 ++++-------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 561daca3..c2622b4c 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,3 @@ examples.txt # Ignore dotenv files /.env* - -# Un-ignore SQLite3 db -!/db/*.sqlite3 -!/db/*.sqlite3-journal diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8c14a6ce..09705d12 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,2 @@ class ApplicationController < ActionController::Base - skip_forgery_protection end diff --git a/config/database.yml b/config/database.yml index cfefc5e7..51624673 100644 --- a/config/database.yml +++ b/config/database.yml @@ -22,10 +22,8 @@ default: &default pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 + <<: *default + database: rails_template_development # The specified database role being used to connect to postgres. # To create additional roles in postgres see `$ createuser --help`. @@ -58,10 +56,8 @@ development: # 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: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 + <<: *default + database: rails_template_test # As with config/credentials.yml, you never want to store sensitive information, # like your database password, in your source code. If your source code is From 80909551120fbbe1790e7e29696983c6c13e91a0 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 13 Sep 2023 07:20:31 -0800 Subject: [PATCH 2/4] pr updates --- config/initializers/appdev_support.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/appdev_support.rb b/config/initializers/appdev_support.rb index e2773f9c..06b8dfce 100644 --- a/config/initializers/appdev_support.rb +++ b/config/initializers/appdev_support.rb @@ -1,7 +1,7 @@ AppdevSupport.config do |config| - config.action_dispatch = true - config.active_record = true - config.pryrc = :minimal + # config.action_dispatch = true + # config.active_record = true + # config.pryrc = :minimal end AppdevSupport.init From 1df333af23a0e588d92db4ecf5a7c542b99d9b8c Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Wed, 13 Sep 2023 07:47:28 -0800 Subject: [PATCH 3/4] remove appdev_support initializer --- config/initializers/appdev_support.rb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 config/initializers/appdev_support.rb diff --git a/config/initializers/appdev_support.rb b/config/initializers/appdev_support.rb deleted file mode 100644 index 06b8dfce..00000000 --- a/config/initializers/appdev_support.rb +++ /dev/null @@ -1,7 +0,0 @@ -AppdevSupport.config do |config| - # config.action_dispatch = true - # config.active_record = true - # config.pryrc = :minimal -end - -AppdevSupport.init From ff3b16fb2118a207d5beec7db4b25c8a726d0a27 Mon Sep 17 00:00:00 2001 From: Ben Purinton Date: Thu, 25 Jul 2024 07:19:33 -0700 Subject: [PATCH 4/4] add appdev support back --- config/initializers/appdev_support.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 config/initializers/appdev_support.rb diff --git a/config/initializers/appdev_support.rb b/config/initializers/appdev_support.rb new file mode 100644 index 00000000..e2773f9c --- /dev/null +++ b/config/initializers/appdev_support.rb @@ -0,0 +1,7 @@ +AppdevSupport.config do |config| + config.action_dispatch = true + config.active_record = true + config.pryrc = :minimal +end + +AppdevSupport.init