Skip to content

Conversation

Gargron
Copy link
Member

@Gargron Gargron commented Dec 21, 2023

Fix #28437, fix #9635, fix #26460

@Gargron Gargron added the ui Front-end, design label Dec 21, 2023
@Gargron Gargron force-pushed the feature-media-reordering branch 2 times, most recently from ce78db0 to b892902 Compare December 21, 2023 12:57
@vmstan
Copy link
Contributor

vmstan commented Dec 21, 2023

Also #26460

@ClearlyClaire
Copy link
Contributor

This isn't easily discoverable, and I don't think this works on mobile, so it doesn't completely fixes the issue, but it's a very nice step forward!

@ClearlyClaire ClearlyClaire changed the base branch from feature-redesign-compose to main December 22, 2023 19:22
@ClearlyClaire
Copy link
Contributor

I took the liberty to change the destination branch, so this PR does not end up like #18474 when #28119 gets merged (apparently it automatically close the PR, and does not allow re-opening it or changing the destination branch once it's closed)

Copy link
Contributor

github-actions bot commented Jan 4, 2024

This pull request has merge conflicts that must be resolved before it can be merged.

@Gargron Gargron force-pushed the feature-media-reordering branch from b892902 to 896164a Compare March 24, 2024 02:55
Copy link

codecov bot commented Mar 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.70%. Comparing base (86500e3) to head (b892902).
Report is 387 commits behind head on main.

❗ Current head b892902 differs from pull request most recent head 896164a. Consider uploading reports for the commit 896164a to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #28456      +/-   ##
==========================================
- Coverage   85.01%   83.70%   -1.31%     
==========================================
  Files        1059     1039      -20     
  Lines       28277    28226      -51     
  Branches     4538     4550      +12     
==========================================
- Hits        24040    23627     -413     
- Misses       3074     3470     +396     
+ Partials     1163     1129      -34     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@renchap renchap requested a review from a team March 24, 2024 11:07
Copy link
Contributor

@ClearlyClaire ClearlyClaire left a comment

Choose a reason for hiding this comment

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

Oops! Sorry I missed this PR! LGTM although we probably have something more discoverable and address mobile as well

@ClearlyClaire ClearlyClaire added this pull request to the merge queue Mar 25, 2024
Merged via the queue into main with commit 8e7e86e Mar 25, 2024
@ClearlyClaire ClearlyClaire deleted the feature-media-reordering branch March 25, 2024 10:35
alexgleason pushed a commit to soapbox-pub/soapbox that referenced this pull request Apr 5, 2024
Based on Gargron's changes in Mastodon: mastodon/mastodon#28456

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
@Sieboldianus
Copy link

Can someone describe how this fix works? I am on 4.2.8 but I cannot reorder images after bulk upload. The documentation for this feature is missing.

@vmstan
Copy link
Contributor

vmstan commented May 2, 2024

It was merged into the main codebase which would be reflective of installs of 4.3 alpha or nightly right now. It wouldn't be backported to 4.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ui Front-end, design
Projects
None yet
4 participants