Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Fix home timeline's regexp field
Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973)
Change links in multi-column mode so tabs are open in single-column mode (#25893)
Fix embed dropdown menu item for unauthenticated users (#25964)
Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941)
Fix incorrect types in DisplayName
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/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.
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/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`.
Remove some recently-updated packages from Renovabot ignore config (#25960)
Fix follow link style in embeds (#25965)