Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
Conflicts:
- `app/javascript/packs/public.jsx`:
Some of the removed dead code was split from this code in
`app/javascript/core/public.js` and `app/javascript/core/settings.js`.
Removed this dead code, and removed `app/javascript/core/public.js`
altogether.
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
Port e90649b064 to glitch-soc
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream refactored slightly (but touching almost all the lines in the code),
glitch-soc had moved a few of the code to another file.
Refactored as upstream did.
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
* Cleanup unused portions of statuses/status partial (#26045)
* Wrong count in response when removing favourite/reblog (#24365)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Paperclip: add support for Azure blob storage (#23607)
* Fix a missing redirection on getting-started in multi column mode (#26070)
* Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040)
* Change casing for 'Server Settings' string (#26011)
* Move localized subject mailer shared example to separate file (#25889)
* Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039)
* Fix `Lint/Void` cop (#25922)
* Add stricter protocol fields validation for accounts (#25937)
* Improve the bug report templates (#25621)
* Fix the crossorigin attribute (#26096)
* Fix replica being used even if not explicitly defined (#26074)
* Clean up unused application records (#24871)
* Change thread view to scroll to the selected post rather than the post being replied to (#24685)
* Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023)
* change focus ui for keyboard only input (#25935)
* Use username as display name for suspended users or users with blank display names (#25276)
* Fix CSP headers being unintendedly wide (#26105)
* Fix linting issue (#26106)
* Replace 'favourite' by 'favorite' for American English (#26009)
* Override default Action Mailer `preview_path` (#26110)
* Favourits -> Favorites (#26109)
* Bump version to v4.1.5 (#26108)
* Fix incorrect connect timeout in outgoing requests (#26116)
* Fix missing translation strings for importing lists (#26120)
* Use valid email address for first account (#26114)
* Update haml-lint 0.49.1 (#26118)
* Fix focus and hover styles in web UI (#26125)
* Remove back button from bookmarks, favourites and lists screens in web UI (#26126)
* Remove 16:9 cropping from web UI (#26132)
* Change design of link previews in web UI (#26136)
* change poll form element colors to fit with the rest of the ui (#26139)
* Add `lang` attribute to trending links (#26111)
* Update dependency rdf-normalize to v0.6.1 (#26130)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency brakeman to v6.0.1 (#26141)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency postcss to v8.4.27 (#26144)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix unexpected redirection to /explore after sign-in (#26143)
* Update dependency aws-sdk-s3 to v1.131.0 (#26145)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add report.updated webhook (#24211)
* Fix LinkCrawlWorker crashing on `null` `created_at` (#26151)
* Fix UI Overlap with the loupe icon in the Explore Tab (#26113)
* Fix missing border on error screen in light theme in web UI (#26152)
* Fix missing action label on sensitive videos and embeds in web UI (#26135)
* Fix `lang` for UI texts in link preview (#26149)
* Add published date and author to news on the explore screen in web UI (#26155)
* Coverage for `Auth::OmniauthCallbacks` controller (#26147)
* fix poll input active style (#26162)
* Add `published_at` attribute to preview cards (#26153)
* Update dependency sass to v1.64.1 (#26146)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Revert poll colors to green outside of compose form (#26164)
* Preserve translation on status re-import (#26168)
* Fix missing GIF badge in account gallery (#26166)
* Reformat large text arg in `FetchLinkCardService` spec (#26183)
* Ignore long line in regex initializer (#26182)
* Reformat large key values in service specs (#26181)
* Reformat large hash in `ContextHelper` module (#26180)
* Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178)
* Extract private methods in `StatusCacheHydrator` (#26177)
* New Crowdin Translations (automated) (#26072)
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Remove the `sr` locale override .rb files (#25927)
* Use correct naming on controller concern specs (#26197)
* Migrate to request specs in `/api/v2/filters` (#25721)
* Fix wrong filters sometimes applying in streaming (#26159)
* Refactor streaming's filtering logic & improve documentation (#26213)
* Add role badges to the WebUI (#25649)
* Change interaction modal in web UI (#26075)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
* Fix crash when processing Flag activity with no status (#26189)
* Storage: add :azure to remaining callers (#26080)
* Remove queued_at value from pubsub payloads (#26173)
* Fix emoji picker button scrolling with textarea content in single-column view (#25304)
* Change the wording of the dismissable explore prompt (#25917)
* Update dependency haml_lint to v0.49.2 (#26222)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228)
* Swap debug statements in streaming server (#26231)
* Fix missing return values in streaming (#26233)
* [Glitch] Wrong count in response when removing favourite/reblog
Port 4c18928a93 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Fix a missing redirection on getting-started in multi column mode
Port 586b1c9dca to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Change thread view to scroll to the selected post rather than the post being replied to
Port e4ea80d808 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Replace 'favourite' by 'favorite' for American English
Port 217ef7f2af to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] change poll form element colors to fit with the rest of the ui
Port 80809ef33e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Add `lang` attribute to trending links
Port 76fce34ebb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab
Port 9a567ec1d1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Fix missing border on error screen in light theme in web UI
Port d1a9f601c7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Fix missing action label on sensitive videos and embeds in web UI
Port 714a20697f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] fix poll input active style
Port 49d2e8979f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Revert poll colors to green outside of compose form
Port ce1f35d7e2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Add published date and author to news on the explore screen in web UI
Port f826a95f6e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Preserve translation on status re-import
Port 6781dc6462 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Fix missing GIF badge in account gallery
Port a4b69bec2e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* Fix interaction modal being broken because of glitch-soc's theming system
* [Glitch] Change interaction modal in web UI
Port b4e739ff0f to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Change the wording of the dismissable explore prompt
Port a4ec187a20 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* Fix CSP tests in glitch-soc
---------
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: Misty De Méo <mistydemeo@gmail.com>
Co-authored-by: Stanislas Signoud <signez@stanisoft.net>
Co-authored-by: gunchleoc <fios@foramnagaidhlig.net>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Trevor Wolf <teeerevor@gmail.com>
Co-authored-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Co-authored-by: mogaminsk <mgmnjp@icloud.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com>
Co-authored-by: gol-cha <info@mevo.xyz>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
* [Glitch] Change search pop-out in web UI
Port 2b11376411 to glitch-soc
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* [Glitch] Change logo version in header based on screen size in web UI
Port remaining change from 6028d047b9 to glitch-soc
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Rename `hashtags.js` to `hashtags.ts` and apply code style changes
Apply changes from e38b391940 (rename to ts), 51b83ed195 (code style change), 73b64b8917 (additional code style change)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove strings for old search
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
