Merge upstream changes up to b1a584d252f4df4c2a1a9400d6588b4f36768216 #2976
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…id/dismiss` for ungrouped notifications (mastodon#33990)
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-4.3 Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method. Added upstream's code. In addition, upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Ported upstream's changes. - `app/services/precompute_feed_service.rb`: Not a real conflict, glitch-soc has extra code for the direct feed. Added upstream's new code for populating lists. - `app/validators/poll_options_validator.rb`: Upstream split `PollValidator` in two, and glitch-soc had local changes to make the options configurable. Refactored as upstream did, keeping glitch-soc's configurable limits. - `app/workers/feed_insert_worker.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes.
Port 0ad5c21 to glitch-soc Signed-off-by: Claire <[email protected]>
Port e856838 to glitch-soc Signed-off-by: Claire <[email protected]>
…ettings Port 82e046e to glitch-soc Signed-off-by: Claire <[email protected]>
…st emoji Port 44f5f1f to glitch-soc Signed-off-by: Claire <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts
app/lib/feed_manager.rb:Not a real conflict, but glitch-soc has an extra
populate_direct_feedmethod.Added upstream's code.
In addition, upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process.
Ported upstream's changes.
app/services/precompute_feed_service.rb:Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
app/validators/poll_options_validator.rb:Upstream split
PollValidatorin two, and glitch-soc had local changes to make the options configurable.Refactored as upstream did, keeping glitch-soc's configurable limits.
app/workers/feed_insert_worker.rb:Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
Ported changes
Postponed / To investigate