Switch Phoenix back to upstream #7803

Merged

lambadalambda merged 7 commits from gitlab-mr-iid-4426 into develop 2026-05-14 09:21:37 +00:00

Conversation 3 Commits 7 Files changed 8 +52 -12

lanodan commented 2026-01-14 02:31:52 +00:00

Owner

Copy link

Checklist

• Adding a changelog: In the changelog.d directory, create a file named <code>.<type>.

cc: @feld

Draft for now as I'd rather merge it in my instance first to check if anything went wrong.

### Checklist - [x] Adding a changelog: In the `changelog.d` directory, create a file named `<code>.<type>`. cc: @feld Draft for now as I'd rather merge it in my instance first to check if anything went wrong.

feld commented 2026-01-14 02:35:42 +00:00

Owner

Copy link

awesome! thanks for getting us off that silly fork

awesome! thanks for getting us off that silly fork

lanodan commented 2026-01-14 03:06:30 +00:00

Author

Owner

Copy link

Gah warning as error only in CI strikes again

Gah warning as error only in CI strikes again

lanodan commented 2026-01-14 04:22:49 +00:00

Author

Owner

Copy link

Quoting commit ba4e194e2 for visibility:

Phoenix 1.8 requires a View module with put_layout so can't set it that early.

It was introduced in 2019 with commit 1097ce6d but nothing seems to provide app.html (anymore?) and it would likely better be set by something like OAuthController / OAuthView.

Quoting commit ba4e194e2 for visibility: <blockquote> Phoenix 1.8 requires a View module with put_layout so can't set it that early.<br /> <br /> It was introduced in 2019 with commit 1097ce6d but nothing seems to provide app.html (anymore?) and it would likely better be set by something like OAuthController / OAuthView. </blockquote>

lanodan added 2 commits 2026-02-06 06:28:27 +00:00

Switch Phoenix back to upstream ... be327ca982

See <https://github.com/phoenixframework/phoenix/pull/6094>
for `:sec_websocket_protocol` -> `:sec_websocket_headers`

Web: remove legacy :set_put_layout plug ... 6f86883cca

Phoenix 1.8 requires a View module with put_layout so can't set it that early.

It was introduced in 2019 with
commit 1097ce6d9f
but nothing seems to provide app.html (anymore?) and it would likely
better be set by something like OAuthController / OAuthView.

lambadalambda added 2 commits 2026-05-11 18:14:44 +00:00

Merge develop into Phoenix upstream migration 216a00f73f

Fix Phoenix upstream migration regressions ab9fd33762

lambadalambda added 1 commit 2026-05-11 18:16:13 +00:00

Merge branch 'develop' into gitlab-mr-iid-4426 8e72f4cd17

lambadalambda added 1 commit 2026-05-11 18:19:53 +00:00

Clarify websocket token precedence test 8a56cf5c0f

lambadalambda added 1 commit 2026-05-14 06:56:58 +00:00

Merge branch 'develop' into gitlab-mr-iid-4426 c7c453ca21

lambadalambda changed title from Draft: Switch Phoenix back to upstream to Switch Phoenix back to upstream 2026-05-14 06:57:17 +00:00

lambadalambda merged commit 093b156c65 into develop 2026-05-14 09:21:37 +00:00

lambadalambda referenced this pull request from a commit 2026-05-14 09:21:37 +00:00

Merge pull request 'Switch Phoenix back to upstream' (#7803) from gitlab-mr-iid-4426 into 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

3 participants

Notifications

Subscribe

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!7803

No description provided.