Merge upstream changes up to a2399046ca600d492b492b8dae88011de687bece #2699
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
…stem preference) (mastodon#29748) Co-authored-by: Nishiki Liu <[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: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…n `welcome` email template (mastodon#29759)
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: Claire <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream
Port fa95740 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 0763522 to glitch-soc Signed-off-by: Claire <[email protected]>
Port e47a3d0 to glitch-soc Signed-off-by: Claire <[email protected]>
…ters Port b4d991a to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.
Port 0b9d410 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
…ht theme Port 5d67247 to glitch-soc Signed-off-by: Claire <[email protected]>
Port e284417 to glitch-soc Signed-off-by: Claire <[email protected]>
Port c6da3ee to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 1c87cb8 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/helpers/application_helper.rb`: Conflict because of our different theming systems. Updated accordingly, along with `app/helpers/theme_helper.rb` and `app/helpers/theme_helper_spec.rb`.
…oc/merge-upstream
…and `README.md`) Port 730e212 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.
Port c386c36 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 37d984b to glitch-soc Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <[email protected]> Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
…ld browsers Port 4117c8f to glitch-soc Signed-off-by: Claire <[email protected]>
Port 66ee0d4 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.
…oc/merge-upstream Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.
…oc/merge-upstream
…oc/merge-upstream
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.
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY,ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT, andACTIVE_RECORD_ENCRYPTION_PRIMARY_KEYwith new secrets (you can callbin/rails db:encryption:initto generate a set of secrets) before restarting Mastodon.Merge upstream changes up to 02ea161
Conflicts
Conflicts:
app/lib/themes.rbapp/views/layouts/application.html.hamlapp/views/layouts/embedded.html.hamlapp/views/layouts/error.html.hamlconfig/settings.ymlAll these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings.
Conflicts were solved to take that into account, and
current_themehas been changed in the process to return a tuple of[flavour, skin]to be used in thetheme_style_tagshelper.Ported changes
Merge upstream changes up to d49343e
Conflicts
None
Ported changes
Merge upstream changes up to 8a498f4
Conflicts
None
Ported changes
Merge upstream changes up to 672c9f5
Conflicts
app/helpers/application_helper.rb:Conflict due to our theming system being different.
Ported upstream's changes.
Ported changes
Merge upstream changes up to 90eb4a5
Conflicts
None
Ported changes
Merge upstream changes up to 143d955
Conflicts
yarn.lock:Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependencies as well.
Merge upstream changes up to c70c39c
Ported changes
Merge upstream changes up to d27eb18
Conflicts
spec/requests/api/v2/instance_spec.rb:Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
Ported changes
Merge upstream changes up to 4045c06
Ported changes
Merge upstream changes up to 52ab8a5
Ported changes
Merge upstream changes up to b61ae28
Conflicts
app/helpers/application_helper.rb:Conflict because of our different theming systems.
Updated accordingly, along with
app/helpers/theme_helper.rbandapp/helpers/theme_helper_spec.rb.Merge upstream changes up to 20b1e55
Ported changes
Merge upstream changes up to 34e826f
Conflicts
app/helpers/theme_helper.rb:Conflict caused by our different theme systems.
Ported upstream's changes.
app/models/account.rb:Upstream basically made a change we already made.
Moved constant declaration to match upstream.
Ported changes
Merge upstream changes up to 0622107
Ported changes
Merge upstream changes up to a390299
Conflicts
app/controllers/accounts_controller.rb:Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
app/lib/account_statuses_filter.rb:Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
Merge upstream changes up to ec71c02
Conflicts
Gemfile:There was an extra newline in glitch-soc for some reason.
Removed it.
Merge upstream changes up to a15139b
No conflicts nor anything to port.
Merge upstream changes up to a239904
No conflicts nor anything to port.