chore(sync): merge voc/main 2026-10-12

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
       - master
       - staging
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 jobs:
   test:
@@ -44,13 +45,21 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
 
+      - name: Set up Node
+        uses: actions/setup-node@v7
+        with:
+          node-version: 22
+
+      - name: Enable pnpm
+        run: corepack enable
+
       - name: Setup config
         run: |
           cp config/settings.yml.template config/settings.yml
           cp config/database.yml.template config/database.yml
 
       - name: Cache dependencies
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -86,3 +95,11 @@ jobs:
 
       - name: Show images
         run: docker images
+
+  deploy-staging:
+    needs: test
+    if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy')
+    uses: ./.github/workflows/deploy.yml
+    with:
+      ref: ${{ github.event.pull_request.head.ref }}
+    secrets: inherit

.github/workflows/deploy.yml

@@ -5,10 +5,102 @@ name: Deploy staging (disabled)
 
 on:
   workflow_dispatch:
+    inputs:
+      ref:
+        description: Branch to deploy
+        required: false
+        type: string
+  workflow_call:
+    inputs:
+      ref:
+        description: Branch to deploy
+        required: true
+        type: string
 
 jobs:
   deploy:
     if: false
     runs-on: ubuntu-latest
     steps:
+<<<<<<< HEAD
       - run: echo "VOC staging deploy is disabled on freifunk/voctoweb"
+=======
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{ inputs.ref || github.ref_name }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - uses: webfactory/ssh-agent@v0.10.0
+        with:
+          # Name of the variable configured in Secrets of our GitHub organisation
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: Add server to known_hosts
+        run: ssh-keyscan -p 22 -H app.media.test.c3voc.de >> ~/.ssh/known_hosts
+      - name: Deploy
+        env:
+          CAP_REPO: https://github.com/voc/voctoweb.git
+          CAP_USER: media
+          CAP_BRANCH: ${{ inputs.ref || github.ref_name }}
+          CAP_HOST: app.media.test.c3voc.de
+          CAP_PORT: 22
+          SKIP_TAG: "true"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bundle exec cap staging deploy
+
+  clear-deploy-labels:
+    needs: deploy
+    if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy')
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Remove deploy label from other PRs
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const currentPr = context.payload.pull_request.number;
+            const prs = await github.paginate(github.rest.pulls.list, {
+              owner, repo, state: "open", per_page: 100,
+            });
+            for (const pr of prs) {
+              if (pr.number === currentPr) continue;
+              if (pr.labels.some((l) => l.name === "deploy")) {
+                await github.rest.issues.removeLabel({
+                  owner, repo, issue_number: pr.number, name: "deploy",
+                });
+              }
+            }
+
+  sync-deploy-label:
+    needs: deploy
+    if: github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Move deploy label to PR for the deployed branch
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const ref = ${{ toJSON(inputs.ref || github.ref_name) }};
+            const prs = await github.paginate(github.rest.pulls.list, {
+              owner, repo, state: "open", per_page: 100,
+            });
+            for (const pr of prs) {
+              const hasLabel = pr.labels.some((l) => l.name === "deploy");
+              if (pr.head.ref === ref) {
+                if (!hasLabel) {
+                  await github.rest.issues.addLabels({
+                    owner, repo, issue_number: pr.number, labels: ["deploy"],
+                  });
+                }
+              } else if (hasLabel) {
+                await github.rest.issues.removeLabel({
+                  owner, repo, issue_number: pr.number, name: "deploy",
+                });
+              }
+            }
+>>>>>>> voc/main

.gitignore

@@ -25,6 +25,9 @@ docker/ssh
 
 # Ignore assets
 public/assets
+/node_modules
+/app/assets/builds/*
+!/app/assets/builds/.keep
 
 # Ignore secret tokens and configs
 config/database.yml

.rubocop_todo.yml

@@ -392,7 +392,7 @@ Naming/MethodParameterName:
 # ForbiddenPrefixes: is_, has_, have_
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Exclude:
     - 'spec/**/*'
     - 'app/models/concerns/storage.rb'

AGENTS.md

@@ -0,0 +1,25 @@
+# Agents.md
+
+Guidance for using LLM-based coding assistants on this repository.
+
+## LLM Usage Policy
+
+Using an LLM to help write code is fine. Reviewers just might want to know when it happened, so they can weigh the review accordingly — code that reads unusually verbose, follows an unfamiliar pattern, or touches a lot of files at once often has an LLM behind it, and reviewers benefit from knowing that up front.
+
+**Rule:** if an LLM generated a substantial part of a commit (not just autocomplete or minor suggestions), add a trailer to the commit message:
+
+```
+Assisted-by: LLM
+```
+
+- Use the generic `LLM` value — don't name the specific product/vendor. The point is disclosure to reviewers, not advertising a tool.
+- Trivial LLM use (autocomplete, one-line suggestions, boilerplate you'd have typed anyway) doesn't need a trailer.
+- You're still fully responsible for the code you commit. Review, understand, and test it before committing, regardless of how it was produced.
+
+## Example
+
+```
+fix: handle nil schedule in conference import
+
+Assisted-by: LLM
+```

Dockerfile

@@ -5,13 +5,20 @@ ARG RUBY_VERSION=3.4
 FROM ruby:${RUBY_VERSION}-alpine
 
 # Install runtime dependencies
-# Node.js is used for JavaScript compression via the uglifier gem
+# Node.js and pnpm are used to bundle JavaScript (esbuild) and CSS (sass)
+# via jsbundling-rails / cssbundling-rails.
+# Keep PNPM_VERSION in sync with "packageManager" in package.json.
+ARG PNPM_VERSION=12.3.4
 RUN set -eux; \
 	apk add --no-cache \
 		dumb-init \
 		nodejs \
+		npm \
 		tzdata \
-	;
+	; \
+	npm install -g "pnpm@${PNPM_VERSION}"; \
+	npm cache clean --force; \
+	pnpm --version
 
 WORKDIR /voctoweb
 
@@ -30,7 +37,7 @@ RUN set -eux; \
 		gcc \
 		libffi-dev \
 		libxml2-dev \
-		libxslt-dev \  
+		libxslt-dev \
 		make \
 		musl-dev \
 		patch \

Gemfile

@@ -2,8 +2,12 @@ source 'https://rubygems.org'
 
 gem 'openssl'
 
+# json 3.0 changed JSON.parse's options arg to keyword-only, which breaks
+# ActiveSupport::JSON.decode's positional call in this Rails version.
+gem 'json', '< 3'
+
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 7.2.2'
+gem 'rails', '~> 8.0'
 gem 'dotenv-rails'
 
 gem 'activeadmin'
@@ -54,24 +58,10 @@ gem 'pg', group: :postgresql
 gem 'elasticsearch-model', '~> 8.0'
 gem 'elasticsearch-rails', '~> 8.0'
 
-# Use SCSS for stylesheets
-gem 'sass-rails'
-gem 'bootstrap-sass', '~> 3.4.1'
-
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails'
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+# Asset pipeline: Propshaft (static) + jsbundling-rails/esbuild + cssbundling-rails/sass, managed via pnpm
+gem 'propshaft'
+gem 'jsbundling-rails'
+gem 'cssbundling-rails'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder'