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