Merge upstream changes up to 0cea7a623be470c51d7a162265f44f5a3e149275 #2691
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: 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>
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: 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: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
4953f50
to
f2b23aa
Compare
Port 44bf7b8 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port be52633 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 885d0fa to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port ec1e770 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 387c78d to glitch-soc Signed-off-by: Claire <[email protected]>
Port de6c9e0 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.
…unconditional Port 37ca598 to glitch-soc Signed-off-by: Claire <[email protected]>
…st followers and following counts separately Port dfa4370 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port dd06129 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 29f9dc7 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 0cea7a6 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 8e7e86e 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.
Merge upstream changes up to 954b470
Conflicts
config/navigation.rb:Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
Ported changes
Merge upstream changes up to 0146407
Ported changes
Merge upstream changes up to 05eda8d
Ported changes
Merge upstream changes up to 119c7aa
Ported changes
Merge upstream changes up to 6c381f2
Conflicts
app/models/user_settings.rb:Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
Ported changes
Skipped changes
Additional changes
Merge upstream changes up to 0cea7a6
Ported changes