Merge master, resolve schema conflicts

config/application.rb

@@ -65,5 +65,14 @@ module Osem
     config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }
 
     config.active_job.queue_adapter = :delayed_job
+
+    config.before_configuration do
+      env_file = File.join(Rails.root, 'config', 'local_env.yml')
+      if File.exist?(env_file)
+        YAML.safe_load(File.open(env_file)).each do |key, value|
+          ENV[key.to_s] = value
+        end
+      end
+    end
   end
 end

config/database.yml

@@ -11,8 +11,8 @@ default: &default
   encoding: <%= encoding %>
   host: <%= ENV['OSEM_DB_HOST'] || 'database' %>
   port: <%= ENV['OSEM_DB_PORT'] || '5432'  %>
-  # username: <%= ENV['OSEM_DB_USER'] || 'postgres' %>
-  # password: <%= ENV['OSEM_DB_PASSWORD'] || 'mysecretpassword' %>
+  username: <%= ENV['OSEM_DB_USER'] || 'postgres' %>
+  password: <%= ENV['OSEM_DB_PASSWORD'] || 'mysecretpassword' %>
   database: <%= ENV['OSEM_DB_NAME'] || 'postgres' %>
   pool: 5
   timeout: 50000

config/routes.rb

@@ -1,6 +1,6 @@
 Osem::Application.routes.draw do
 
-  mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development?
+  mount LetterOpenerWeb::Engine, at: '/letter_opener' if Rails.env.development?
 
   if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
     devise_for :users, controllers: { registrations: :registrations }