Merge upstream changes #25979
Closed
Merge upstream changes #25979
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
Fixes issues with the JS for at least sign-up pages not working
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Borders in blockquotes in reply-indicator weren't colored properly. avatar margin when viewing edited toots dropdown was applied to wrong side. Conversations had padding applied to the wrong side. Padding for notifcation cleaner checkboxes was applied to wrong side. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
Port c1a7e38 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ector 15 (text) Port 37886c2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port fbb4de3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port e713c54 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…e more visible Port e1b4eeb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… web UI Port 7cf963e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 290e4ab to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 105f868 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2daa5a1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 6028d04 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…-soc translations
…upstream Merge upstream changes
* New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip]
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons * Run stylelint --fix * Avoid `@extend` directives with doodle modal CSS * Drop use of `@extend` for notification cleanup buttons SCSS * Run prettier on SCSS
…ed divergences with upstream (mastodon#2208) * Run eslint --fix * Fix linting issues in video player and reduce divergences with upstream This includes a behavior change of not auto-looping videos anymore. I don't remember loops being ever intended, and they have been removed from upstream a while ago, but we somehow missed the change. * Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js` Those were basically caused by dead code that isn't present upstream, so that brings us closer to upstream as well. * Fix linting issue and bug in streaming/index.js * Fix linting issues in config/webpack/shared.js * Fix unused import in flavours/glitch/features/ui/index.js * Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx * Fix linting issues in flavours/glitch/reducers * Fix linting issues in glitch-soc onboarding modal * Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx * Remove dead code for unused local setting navbar_under * Fix various linting issues * Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
When cancelling a reply, the language was still set to the language of the replied to toot. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
…am (mastodon#2209) * Fix typo in flavours/glitch/features/video/index.js * Fix various linting issues and discrepancies with upstream
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js` This is some added boilerplate but it's much more consistent with the remaining of the code, and avoids the linting issue. * Fix missing /privacy-policy link in DM warning because of wrongly-named import * Fix unnecessary import * Fix regexp in flavours/glitch/utils/hashtag.js
* Fix uses of intl.formatMessages without default messages * Ignore lint issue for ColumnLink button
…oc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.
…oc/merge-upstream
Port c27b82a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port af54bf5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port ea10feb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes
Port 1392f31 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.
…upstream Merge upstream changes
…oc/merge-upstream Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.
…oc/merge-upstream Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.
Port 73b64b8 to glitch-soc
…oc/merge-upstream
Port a75138d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port a725307 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5a3f174 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…upstream Merge upstream changes
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column. This change has been missed in e91bf82 Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
…oc/merge-upstream
Port 41f65ed to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port a8edbcf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…-column mode Port 5fad7bd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ab in advanced interface Port 71db616 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| _ensureHistoryBuffer () { | ||
| const { pathname, state } = this.history.location; | ||
| if (!state || state.mastodonModalKey !== this._modalHistoryKey) { | ||
| this.history.push(pathname, { ...state, mastodonModalKey: this._modalHistoryKey }); |
Check warning
Code scanning / CodeQL
Client-side cross-site scripting Medium
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.
Conflicts
None
Ported changes
Additional changes