Skip to content

contributing: remove mentions of hypernext/next branches#3

Merged
NicolasCARPi merged 5 commits intomasterfrom
nico-260301-rmnext
Mar 1, 2026
Merged

contributing: remove mentions of hypernext/next branches#3
NicolasCARPi merged 5 commits intomasterfrom
nico-260301-rmnext

Conversation

@NicolasCARPi
Copy link
Copy Markdown
Contributor

@NicolasCARPi NicolasCARPi commented Mar 1, 2026

Summary by CodeRabbit

  • Documentation

    • Clarified backup procedures and added an important note about excluding config files from automatic backups.
    • Simplified installation/setup instructions and updated contributor workflow guidance to a master-centric process.
  • Chores

    • Updated CI workflow branch targeting to limit runs to master.
    • Minor update to the pull request template text.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 1, 2026

Walkthrough

This pull request shifts repository guidance and CI to treat master as the primary integration branch, updating PR templates, workflow branch filters, contributor/install docs, Docker image tags, and backup documentation clarifications about elabctl excluding configuration files.

Changes

Cohort / File(s) Summary
PR Template & CI
.github/PULL_REQUEST_TEMPLATE.md, .github/workflows/codespell.yml
PR template text simplified to an emoticon; codespell workflow restricted to run only on master for push and PR events (removed next/hypernext). Review workflow triggers.
Contributor & Install Docs
docs/contributing/devdoc.md, docs/contributing/installation.md
Replaced hypernext references with master as base/target branch; updated example commands and fork/clone guidance; switched Docker image tag from elabftw/elabimg:hypernext to elabftw/elabimg:edge. Verify examples and image tag correctness.
Backups Documentation
docs/install/backups.md
Clarifies backups: elabctl handles MySQL via mysqldump and files via borgbackup; configuration file intentionally excluded to avoid secrets being archived; guidance on re-encryption and restoring secrets added. Check security notes and recommended ops.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Poem

Make it so: the branches converge to master bright,
Docs rewritten, workflows set aright,
Backups keep the data, secrets stay apart,
A calm, precise course steered with steady heart,
Engage—voyage onward, code and chart.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely summarizes the main objective of the PR: removing references to hypernext and next branches throughout the documentation.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch nico-260301-rmnext

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In @.github/PULL_REQUEST_TEMPLATE.md:
- Line 1: Replace the single-line smiley in .github/PULL_REQUEST_TEMPLATE.md
with a full actionable PR template: restore sections for Title/summary, Context
& problem statement, What changed (high-level list), How to test
(manual/automated steps), Related issues/links, Checklist (tests, lint, docs,
changelog), and Reviewers/labels; implement these as markdown headings, optional
<details> blocks and checkbox items so contributors are prompted to include
intent, testing steps, and required checks before requesting review.

In `@docs/contributing/devdoc.md`:
- Around line 35-37: The document has conflicting branch guidance: one section
says PRs target "master" while another recommends "next"; pick the canonical
branch (e.g., "next" for active development or "master" for stable PRs) and make
the text consistent throughout by replacing the alternate branch reference so
both the PR target sentence (the sentence mentioning "The target for Pull
Requests is the `master` branch.") and the earlier line that mentions the `next`
branch match; also ensure the release workflow sentence that references
"release/X.Y" and "patch releases ... cherry-picking ... in `master`" is aligned
with your chosen canonical branch (update "master" to "next" or vice versa) and
keep the release/tagging wording consistent with that choice.

In `@docs/install/backups.md`:
- Line 20: The sentence contains a wording typo: replace the phrase "responsible
from backing up your configuration values" with "responsible for backing up your
configuration values" in the docs text (look for the string "responsible from
backing up" in the backups.md content) so the sentence reads correctly and
preserves the rest of the paragraph and examples (e.g., mentions of SECRET_KEY,
database password/IP, bind-mounted folders, ENV vars).

ℹ️ Review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 73bc342 and 352b626.

📒 Files selected for processing (5)
  • .github/PULL_REQUEST_TEMPLATE.md
  • .github/workflows/codespell.yml
  • docs/contributing/devdoc.md
  • docs/contributing/installation.md
  • docs/install/backups.md

Comment thread .github/PULL_REQUEST_TEMPLATE.md
Comment thread docs/contributing/devdoc.md
Comment thread docs/install/backups.md Outdated
Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

♻️ Duplicate comments (1)
docs/contributing/devdoc.md (1)

35-37: ⚠️ Potential issue | 🟡 Minor

Steady as she goes—one grammar fix remains in release workflow text.

Line 37 should read “bugfix commits,” not “bugfixes commits.”

Proposed fix
-Releases get tagged from a `release/X.Y` branch. And patch releases are built from cherry-picking bugfixes commits in `master`.
+Releases get tagged from a `release/X.Y` branch, and patch releases are built by cherry-picking bugfix commits in `master`.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@docs/contributing/devdoc.md` around lines 35 - 37, Fix the grammar in the
release workflow sentence: locate the sentence that reads "Releases get tagged
from a `release/X.Y` branch. And patch releases are built from cherry-picking
bugfixes commits in `master`." and change "bugfixes commits" to "bugfix commits"
so it reads "patch releases are built from cherry-picking bugfix commits in
`master`."
🧹 Nitpick comments (1)
docs/contributing/devdoc.md (1)

260-260: Optional precision: make the clone branch explicit.

To keep this doc future-proof, you may explicitly clone master in the example.

Optional tweak
-git clone https://github.com/elabftw/elabftw
+git clone --branch master https://github.com/elabftw/elabftw
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@docs/contributing/devdoc.md` at line 260, Update the example git clone
command to explicitly specify the branch (e.g., use "git clone --branch master
https://github.com/elabftw/elabftw" or "git clone -b master --single-branch
https://github.com/elabftw/elabftw") so the devdoc's clone example is
future-proof; replace the existing "git clone
https://github.com/elabftw/elabftw" line in the docs/contributing/devdoc.md with
the branch-explicit form.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@docs/contributing/devdoc.md`:
- Line 10: The caution sentence on line containing "It is possible that the gap
between the current development version and the current stable version will
render this documentation obsolete in parts. As we currently have no versioning
of the doc to match stable releases of eLabFTW. I don't know, just do your
best." is awkward and contains a fragment; replace it with a single clear
sentence that explains potential divergence and lack of doc versioning — for
example: "Because the development branch may diverge from the stable release and
we do not version these docs to match eLabFTW releases, some content may become
outdated; please update documentation when you notice discrepancies." Update the
sentence in docs/contributing/devdoc.md accordingly to remove the fragment and
improve clarity.

---

Duplicate comments:
In `@docs/contributing/devdoc.md`:
- Around line 35-37: Fix the grammar in the release workflow sentence: locate
the sentence that reads "Releases get tagged from a `release/X.Y` branch. And
patch releases are built from cherry-picking bugfixes commits in `master`." and
change "bugfixes commits" to "bugfix commits" so it reads "patch releases are
built from cherry-picking bugfix commits in `master`."

---

Nitpick comments:
In `@docs/contributing/devdoc.md`:
- Line 260: Update the example git clone command to explicitly specify the
branch (e.g., use "git clone --branch master https://github.com/elabftw/elabftw"
or "git clone -b master --single-branch https://github.com/elabftw/elabftw") so
the devdoc's clone example is future-proof; replace the existing "git clone
https://github.com/elabftw/elabftw" line in the docs/contributing/devdoc.md with
the branch-explicit form.

ℹ️ Review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 352b626 and 9061a26.

📒 Files selected for processing (2)
  • docs/contributing/devdoc.md
  • docs/install/backups.md

Comment thread docs/contributing/devdoc.md
* master:
  backups: clarify backup of config file (#2)
@NicolasCARPi NicolasCARPi merged commit dd1bce2 into master Mar 1, 2026
2 checks passed
@NicolasCARPi NicolasCARPi deleted the nico-260301-rmnext branch March 1, 2026 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant