From 92139d41d90d2421ad18c517d3e8ba47d4c92077 Mon Sep 17 00:00:00 2001 From: Flavio Wuensche Date: Wed, 22 Apr 2026 15:07:53 +0200 Subject: [PATCH 1/2] Update README setup steps: drop rbenv-vars, add master key + parity notes - Remove `.rbenv-vars.template` and the `cp` step (all secrets are now in Rails credentials). - Note that contributors need `config/master.key` to decrypt credentials. - Document the parity gem's `heroku git:remote` setup for prod shortcuts. - Sync `package-lock.json` with the `node: 20.x` engines pin from #622. Co-Authored-By: Claude Opus 4.7 --- .rbenv-vars.template | 7 ------- README.md | 17 ++++++++++++----- package-lock.json | 3 +++ 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 .rbenv-vars.template diff --git a/.rbenv-vars.template b/.rbenv-vars.template deleted file mode 100644 index 8c4a4763..00000000 --- a/.rbenv-vars.template +++ /dev/null @@ -1,7 +0,0 @@ -ADMIN_EMAILS= -BREVO_API_KEY= -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= -SMTP_PASSWORD= -STRIPE_SECRET_KEY= -TELEGRAM_TOKEN= diff --git a/README.md b/README.md index a4c789ba..4e864306 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,6 @@ npm install docker compose up -d rails db:setup -# setup local env vars -cp .rbenv-vars.template .rbenv-vars - # launch the server bin/dev @@ -55,8 +52,18 @@ export API_URL=http://localhost:3001/api cherry backfill --api-key=28ea02ee-c6e5-4e5f-b2b6-690c4cd6ca2f # Copy command from http://localhost:3001/user/projects ``` -> The env vars step above assumes you're using the rbenv-vars plugin. If you don't have it installed, check their docs -> [here](https://github.com/rbenv/rbenv-vars) or use an alternative method to load your environment variables. +> Secrets are stored in `config/credentials.yml.enc`. To decrypt them you need `config/master.key` (or the +> `RAILS_MASTER_KEY` env var) — ask a maintainer for it. + +### Heroku shortcuts (parity) + +The [`parity`](https://github.com/thoughtbot/parity) gem provides shortcuts like `production console`, `production logs`, +and `development restore production` to sync the prod database into dev. It expects a git remote named after each +environment: + +```sh +heroku git:remote -r production -a cherrypush-production +``` ## Contributing diff --git a/package-lock.json b/package-lock.json index 857dfd65..69b89c1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,6 +45,9 @@ "prettier-plugin-erb": "^0.4.0", "vite": "^6.2.3", "vite-plugin-ruby": "^5.0.0" + }, + "engines": { + "node": "20.x" } }, "node_modules/@aashutoshrathi/word-wrap": { From ac30faea7ef78818455490d13d2940f6ad176ebd Mon Sep 17 00:00:00 2001 From: Flavio Wuensche Date: Wed, 22 Apr 2026 15:11:16 +0200 Subject: [PATCH 2/2] Fix README formatting (prettier) Co-Authored-By: Claude Opus 4.7 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e864306..282fe86f 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ cherry backfill --api-key=28ea02ee-c6e5-4e5f-b2b6-690c4cd6ca2f # Copy command fr ### Heroku shortcuts (parity) -The [`parity`](https://github.com/thoughtbot/parity) gem provides shortcuts like `production console`, `production logs`, -and `development restore production` to sync the prod database into dev. It expects a git remote named after each -environment: +The [`parity`](https://github.com/thoughtbot/parity) gem provides shortcuts like `production console`, +`production logs`, and `development restore production` to sync the prod database into dev. It expects a git remote +named after each environment: ```sh heroku git:remote -r production -a cherrypush-production