Merge upstream changes up to 24319836de6046fb2985ec1a24c30ad7d47584d7 #2674
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: Renaud Chaput <[email protected]>
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>
…oc/merge-upstream Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.
Port 5b3a873 to glitch-soc Signed-off-by: Claire <[email protected]>
…hen open in web UI Port 2347ea8 to glitch-soc Signed-off-by: Claire <[email protected]>
… in UI Port b9722df to glitch-soc Signed-off-by: Claire <[email protected]>
… web UI Port 16c8567 Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
4 times, most recently
from
c71154b to
d56e7ec
Compare
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
ce0460c to
1940a50
Compare
Port c10bbf5 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 19efa1b to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
1940a50 to
b36e96e
Compare
…oc/merge-upstream
Port af4e44e to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 5b60d4b Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 00d94f3 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `spec/controllers/api/v1/accounts/credentials_controller_spec.rb` Conflict due to glitch-soc's different note length handling. Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
…oc/merge-upstream
Port 268856d to glitch-soc Signed-off-by: Claire <[email protected]>
Port acf3f41 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `spec/lib/sanitize/config_spec.rb`: Conflict due to glitch-soc having factored the file differently. Ported upstream's changes.
Port a32a126 to glitch-soc Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
58b04d1 to
369e728
Compare
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 is a big, pretty disruptive one, with the addition of notification policies and notification requests. It also removes a lot of background colors.
Merge upstream changes up to 2431983
Conflicts
config/routes/api.rb:glitch-soc has an extra
:destroyaction on notifications for historical reasons.Kept it for now, while otherwise updating as upstream did.
Ported changes
Merge upstream changes up to af4e44e
Ported changes
Merge upstream changes up to d4ed7e4
Ported changes
Merge upstream changes up to 2c0441a
Ported changes
Merge upstream changes up to b43eaa4
Conflicts
spec/controllers/api/v1/accounts/credentials_controller_spec.rbConflict due to glitch-soc's different note length handling.
Ported the changes in
spec/requests/api/v1/accounts/credentials_spec.rbinstead.Merge upstream changes up to acf3f41
Ported changes
Merge upstream changes up to a32a126
Conflicts
spec/lib/sanitize/config_spec.rb:Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
Ported changes
Additional changes