Merge remote-tracking branch 'upstream/main' into 4175-add-request-ty…

…pe-flag

.devcontainer/Dockerfile

@@ -2,4 +2,8 @@
 # it will be more efficient to change the image.
 # See https://github.com/devcontainers/images/blob/main/src/ruby/history/
 FROM mcr.microsoft.com/devcontainers/ruby:dev-3.2-buster
-RUN apt -y update && apt install -y vim curl gpg postgresql postgresql-contrib
+RUN export DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get -y install vim curl gpg postgresql postgresql-contrib
+RUN cd /tmp
+RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+    && apt-get -y install ./google-chrome-stable_current_amd64.deb

.devcontainer/devcontainer.json

@@ -2,7 +2,24 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/postgres
 {
   "dockerComposeFile": "docker-compose.yml",
-  "forwardPorts": [3000, 5432],
+  "features": {
+    "ghcr.io/devcontainers/features/desktop-lite:1": {}
+  },
+  "forwardPorts": [3000, 5432, 6080],
+  "portsAttributes": {
+    "3000": {
+      "label": "Application",
+      "onAutoForward": "silent"
+    },
+    "5432": {
+      "label": "Database",
+      "onAutoForward": "silent"
+    },
+    "6080": {
+      "label": "Desktop",
+      "onAutoForward": "silent"
+    }
+  },
   "workspaceFolder": "/workspaces/human-essentials",
   "service": "app",
   "customizations": {
@@ -16,5 +33,10 @@
     }
   },
 
-  "postCreateCommand": ".devcontainer/post-create.sh"
+  // DOCKER env variable passed to Cuprite to enable --no-sandbox so Chrome can run in Docker
+  "remoteEnv": {
+    "DOCKER": "true"
+  },
+
+  "postCreateCommand": "bash -i .devcontainer/post-create.sh"
  }

.devcontainer/docker-compose.yml

@@ -9,6 +9,9 @@ services:
     volumes:
       - ../..:/workspaces:cached
 
+    # Increase shared memory for Chrome to run in Fluxbox
+    shm_size: "2gb"
+
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 

.devcontainer/launch.json.codespaces

@@ -0,0 +1,32 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "ruby_lsp",
+            "request": "launch",
+            "name": "Debug rspec at cursor with browser",
+            "program": "bundle exec rspec ${file}:${lineNumber}",
+            "env": {
+                "NOT_HEADLESS": "true"
+            }
+        },
+        {
+            "type": "ruby_lsp",
+            "request": "launch",
+            "name": "Debug with Events rspec at cursor with browser",
+            "program": "bundle exec rspec ${file}:${lineNumber}",
+            "env": {
+                "NOT_HEADLESS": "true",
+                "EVENTS_READ": "true"
+            }
+        },
+        {
+            "type": "ruby_lsp",
+            "request": "attach",
+            "name": "Attach to a live server"
+        }
+    ]
+}

.devcontainer/post-create.sh

@@ -2,6 +2,7 @@ RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
 
 # copy the file only if it doesn't already exist
 cp -n .devcontainer/.env.codespaces .env
+mkdir -p .vscode && cp -n .devcontainer/launch.json.codespaces .vscode/launch.json
 
 # If the project's required ruby version changes from 3.2.2, this command
 # will download and compile the correct version, but it will take a long time.
@@ -11,4 +12,8 @@ if [ "$RUBY_VERSION" != "3.2.2" ]; then
   echo "Ruby $RUBY_VERSION installed"
 fi
 
+nvm install node
+rbenv init bash
+rbenv init zsh
+
 bin/setup

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,6 +8,7 @@
 - I have added tests that prove my fix is effective or that my feature works,
 - New and existing unit tests pass locally with my changes ("bundle exec rake"),
 - Title include "WIP" if work is in progress.
+- I acknowledge that I will *not* force push my branch once reviews have started.
 
 -->
 

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
 - package-ecosystem: bundler
   directory: "/"
   schedule:
-    interval: daily
+    interval: monthly
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: bootstrap
@@ -23,6 +23,9 @@ updates:
   - dependency-name: geocoder
     versions:
     - 1.6.7
+  - dependency-name: strong_migrations
+    versions:
+     - 1.8.0
   - dependency-name: devise_invitable
     versions:
     - 2.0.4

.rubocop_todo.yml

@@ -225,7 +225,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'app/models/product_drive_participant.rb'
     - 'app/models/distribution.rb'
     - 'app/models/donation.rb'
-    - 'app/models/inventory_item.rb'
     - 'app/models/item.rb'
     - 'app/models/item_category.rb'
     - 'app/models/kit.rb'