Merge upstream changes up to 8ebc94dd22a18c28c4c9763b909e92e6ba64e242 #2527
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
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
…stodon#27858) Co-authored-by: Claire <[email protected]>
…7716) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ers/statuses` spec (mastodon#27875)
…ccounts/relationships` spec (mastodon#27879)
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.
…oc/merge-upstream Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.
…oc/merge-upstream
Port 922f086 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 0a6ec04 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
changed the title
…oc/merge-upstream
…oc/merge-upstream Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.
ClearlyClaire
changed the title
…oc/merge-upstream Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.
…n logged out Port 6e70819 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
changed the title
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.
This should not lead to any breaking change, but streaming server and assets building NodeJS dependencies have been split into two package files. The i18n failures will be solved once #2526 is ported.
Merge upstream changes up to 7e1a77e
Conflicts
app/controllers/api/v1/timelines/public_controller.rb:Upstream refactored this code, the conflict was because of an extra supported parameter,
allow_local_only.Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.
Merge upstream changes up to 15b2d7e
Conflicts
package.json:Upstream split some dependencies, including
express, tostreaming/package.json.However, glitch-soc had extra dependencies textually close to
express.Kept the extra dependencies and moved
expressto streaming.yarn.lock:Upstream split some dependencies, including
express, tostreaming/package.json.However, glitch-soc had extra dependencies textually close to
express.Kept the extra dependencies and moved
expressto streaming.Merge upstream changes up to bd575a1
Ported changes
Postponed changes
Merge upstream changes up to 1526e54
Ported changes
Postponed changes
Merge upstream changes up to 12c22ee
Postponed changes
Merge upstream changes up to 973597c
Conflicts
app/validators/status_pin_validator.rb:Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's configurability.
Postponed changes
Recordfor accounts in Redux state #2516)Additional changes
Merge upstream changes up to 8ebc94d'
Conflicts
app/views/admin/custom_emojis/new.html.haml:Conflict caused by glitch-soc having a different file size limit constant name.
Updated like upstream did while keeping glitch-soc's constant name.
Ported changes