pleroma/pleroma
Watch
4
6
Fork
You've already forked pleroma
 13
Code Issues 357 Pull requests 44 Projects Releases 1 Packages 13 Wiki Activity

Revert "Merge pull request 'MediaProxy: detect images when there's no file extension' (#7933) from mediaproxy-content-type into develop" #7959

Merged
phnt merged 1 commit from revert-7933 into develop 2026-08-14 20:24:57 +00:00
Conversation 0 Commits 1 Files changed 7 +23 -294
phnt commented 2026-08-13 21:07:18 +00:00
Owner
Copy link

A partial revert, keeping the updated @inline_content_types list and
cosmetic changes.

This reverts commit 4fe567064a, reversing
changes made to 9b8aa2e2ee.

Caused all media attachments to have file names inline.<file type>.

Closes pleroma/pleroma#7948

Checklist

  • Adding a changelog: In the changelog.d directory, create a file named <code>.<type>.
A partial revert, keeping the updated @inline_content_types list and cosmetic changes. This reverts commit 4fe567064a9ea8ff4cc6c56e0f89caad71275a99, reversing changes made to 9b8aa2e2ee225dc69a528e7063be3620a79f9e33. --- Caused all media attachments to have file names `inline.<file type>`. Closes pleroma/pleroma#7948 ### 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). -->
Revert "Merge pull request 'MediaProxy: detect images when there's no file extension' (#7933) from mediaproxy-content-type into develop"
Some checks failed
ci/woodpecker/pr/changelog Pipeline failed
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.15 Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.19 Pipeline was successful
Details
f672ab337c
 
A partial revert, keeping the updated @inline_content_types list and
cosmetic changes.

This reverts commit 4fe567064a, reversing
changes made to 9b8aa2e2ee.
phnt changed title from WIP: Revert "Merge pull request 'MediaProxy: detect images when there's no file extension' (#7933) from mediaproxy-content-type into develop" to Revert "Merge pull request 'MediaProxy: detect images when there's no file extension' (#7933) from mediaproxy-content-type into develop" 2026-08-14 20:24:31 +00:00
phnt merged commit 48d6e9476b into develop 2026-08-14 20:24:57 +00:00
phnt deleted branch revert-7933 2026-08-14 20:24:57 +00:00
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!7959
No description provided.