resolve conflicts

Author: bubunyo

.gitignore

@@ -42,3 +42,4 @@
 !/.env
 
 !/config/credentials/development.key
+.DS_Store

app/views/layouts/application.html.erb

@@ -142,7 +142,7 @@
                 group-hover:to-primary-700 transition-all
               "
             >
-              <%= image_tag "neural-network.png", class: "w-16" %>
+              <%= image_tag "neural-network.png", class: "w-8" %>
             </h1>
           </a>
         </div>

config/database.yml

@@ -68,4 +68,7 @@ production:
     <<: *default
     database: storage/production_cable.sqlite3
     migrations_paths: db/cable_migrate
-  errors: *errors
+  errors:
+    <<: *default
+    database: storage/production-errors.sqlite3
+    migrations_paths: db/errors_migrate

config/initializers/001_ensure_required_env.rb

@@ -5,9 +5,7 @@
 
 if Rails.env.production?
   required_env_vars += %w[
-    RAILS_MASTER_KEY DATABASE_URL SENDGRID_API_KEY
-    GOOGLE_CLIENT_ID GOOGLE_CLIENT_SECRET
-    GITHUB_CLIENT_ID GITHUB_CLIENT_SECRET
+    RAILS_MASTER_KEY
   ]
 end
 

fly.toml

@@ -10,11 +10,12 @@ console_command = '/rails/bin/rails console'
 [build]
 
 [http_service]
-  internal_port = 8080
+  internal_port = 3000
   force_https = true
-  auto_stop_machines = 'stop'
+  auto_stop_machines = false
   auto_start_machines = true
-  min_machines_running = 0
+  min_machines_running = 1
+  max_machines_running = 1
   processes = ['app']
 
 [[vm]]
@@ -24,5 +25,5 @@ console_command = '/rails/bin/rails console'
 
 [mounts]
   source = "unicef_hack_25"
-  destination = "/data"
-  processes= ["app"]
+  destination = "/rails/storage"
+  processes = ["app"]