pleroma/pleroma
pleroma/pleroma
Watch
3
6
Fork
You've already forked pleroma
 17
Code Issues 360 Pull requests 63 Projects Releases 1 Packages 13 Wiki Activity

FrontendStatic: Fix crash on invalid configuration #7984

Open
phnt wants to merge 1 commit from frontendstatic-nil-config-crash into develop
pull from: frontendstatic-nil-config-crash
merge into: pleroma:develop
Conversation 0 Commits 1 Files changed 3 +34 -2
phnt commented 2026-09-02 22:02:23 +00:00
Member
Copy link

Will instead serve the bundled FE, unless the user also placed the frontend files in instance/static/frontends//, ie. without placing them in the folder.

Companion to pleroma/pleroma!7983 which prevents users from setting the invalid config via ConfigDB. But an invalid config can still be specified via *.secret.exs.

Checklist

  • Adding a changelog: In the changelog.d directory, create a file named <code>.<type>.
Will instead serve the bundled FE, unless the user also placed the frontend files in instance/static/frontends/<FE>/<files here>, ie. without placing them in the <ref> folder. Companion to pleroma/pleroma!7983 which prevents users from setting the invalid config via ConfigDB. But an invalid config can still be specified via `*.secret.exs`. ### Checklist - [X] Adding a changelog: In the `changelog.d` directory, create a file named `<code>.<type>`. <!-- `<code>` can be anything, but we recommend using a more or less unique identifier to avoid collisions, such as the branch name. `<type>` can be `add`, `change`, `remove`, `fix`, `security` or `skip`. `skip` is only used if there is no user-visible change in the PR (for example, only editing comments in the code). Otherwise, choose a type that corresponds to your change. In the file, write the changelog entry. For example, if a PR adds group functionality, we can create a file named `group.add` and write `Add group functionality` in it. If one changelog entry is not enough, you may add more. But that might mean you can split it into two PRs. Only use more than one changelog entry if you really need to (for example, when one change in the code fix two different bugs, or when refactoring). -->
FrontendStatic: Fix crash on invalid configuration
All checks were successful
ci/woodpecker/pr/changelog Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.19 Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.15 Pipeline was successful
Details
deff445b3e
 
Will instead serve the bundled FE, unless the user also placed the
frontend files in instance/static/frontends/<FE>/<files here>,
ie. without placing them in the <ref> folder.
All checks were successful
ci/woodpecker/pr/changelog Pipeline was successful
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.19 Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.15 Pipeline was successful
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin frontendstatic-nil-config-crash:frontendstatic-nil-config-crash
git switch frontendstatic-nil-config-crash

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff frontendstatic-nil-config-crash
git switch frontendstatic-nil-config-crash
git rebase develop
git switch develop
git merge --ff-only frontendstatic-nil-config-crash
git switch frontendstatic-nil-config-crash
git rebase develop
git switch develop
git merge --no-ff frontendstatic-nil-config-crash
git switch develop
git merge --squash frontendstatic-nil-config-crash
git switch develop
git merge --ff-only frontendstatic-nil-config-crash
git switch develop
git merge frontendstatic-nil-config-crash
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
AP C2S

   
AdminAPI

   
Breaking API
Affects clients

  
Breaks existing config

   
Check if still valid

   
Data Protection

   
Do not merge

   
Document in the changelog

   
Doing

   
Feature Request / Enhancement

   
MastoAPI

   
NL2
Improved Mobile Experience

  
NL4
Improved instance customization and QoL options

  
OStatus

   
OTP Releases

   
Refactor

   
Security

   
To Do

   
TwitterAPI

   
bug

   
complicated

   
confirmed

   
deps

   
discussion

   
documentation

   
easy

   
feature: to be merged in stable

   
fix: to be merged in stable

   
incident
Denotes a disruption to IT services and the associated issues require immediate attention

  
needs to be backported to maint

   
needs-changes

   
needs-info

   
needs-review

   
performance

   
regression

   
unclear
No labels
AP C2S
AdminAPI
Breaking API
Breaks existing config
Check if still valid
Data Protection
Do not merge
Document in the changelog
Doing
Feature Request / Enhancement
MastoAPI
NL2
NL4
OStatus
OTP Releases
Refactor
Security
To Do
TwitterAPI
bug
complicated
confirmed
deps
discussion
documentation
easy
feature: to be merged in stable
fix: to be merged in stable
incident
needs to be backported to maint
needs-changes
needs-info
needs-review
performance
regression
unclear
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
pleroma/pleroma!7984
No description provided.