Try to fix merge conflicts #2
Closed
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: Eugen Rochko <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
…oc/merge-upstream - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.
Port 9ebed5d to glitch-soc Signed-off-by: Claire <[email protected]>
Port 0ad5c21 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 27e79da to glitch-soc Signed-off-by: Claire <[email protected]>
… in moderation interface Port 1be83c6 to glitch-soc Signed-off-by: Claire <[email protected]>
… web UI Port 1a88c05 to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict due to upstream adding fallback support for MathML Core while glitch-soc supported slightly more tags than upstream. Added the MathML Core fallback code to glitch-soc. - `spec/lib/sanitize/config_spec.rb`: Ditto.
Port 429e08e to glitch-soc Signed-off-by: Claire <[email protected]>
Port 7a3dea3 to glitch-soc Signed-off-by: Claire <[email protected]>
Port eef8d2c to glitch-soc Co-authored-by: Eugen Rochko <[email protected]> Signed-off-by: Claire <[email protected]>
Port 7f2cfcc to glitch-soc Signed-off-by: Claire <[email protected]>
…oc/merge-upstream
Port 986a367 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 4de108e to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 75ecc6d
Co-authored-by: Claire <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Port 9ff0140 to glitch-soc Signed-off-by: Claire <[email protected]>
…/middle-click Port upstream's middle-click handling changes
* New Crowdin translations * Fix bogus no.yml * Fix bogus simple_form.no.yml --------- Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Claire <[email protected]>
…oc/merge-upstream Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well.
Port 346a27b to glitch-soc Signed-off-by: Claire <[email protected]>
Port 04b7046 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 6cf8776 to glitch-soc Signed-off-by: Claire <[email protected]>
…in web UI Port 7135f51 to glitch-soc Signed-off-by: Claire <[email protected]>
…tyles Port b82c791 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 25387dc to glitch-soc Signed-off-by: Claire <[email protected]>
Port ca45f89 to glitch-soc Signed-off-by: Claire <[email protected]>
… web UI Port bf79174 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 30aa0df to glitch-soc Signed-off-by: Claire <[email protected]>
Port 6615f17 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 425311e to glitch-soc Signed-off-by: Claire <[email protected]>
Port 58c5068 to glitch-soc Signed-off-by: Claire <[email protected]>
Port ded799f to glitch-soc Signed-off-by: Claire <[email protected]>
…ntions Port a4560d9 to glitch-soc Signed-off-by: Claire <[email protected]>
Port da279df to glitch-soc Signed-off-by: Claire <[email protected]>
Port 234af14 to glitch-soc Signed-off-by: Claire <[email protected]>
Port 3cf6681 to glitch-soc Signed-off-by: Claire <[email protected]>
Port f19fd0b to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>
Port 0636bcd to glitch-soc Signed-off-by: Claire <[email protected]>
…e-upstream Merge upstream changes up to 8770905
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.
No description provided.