~cytrogen/masto-fe

01d6f752 — Claire 3 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
c6c03b49 — Nick Schonning 3 years ago
Add Roadmap to README (#24288)

Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320)

1f19d5e5 — Nick Schonning 3 years ago
Add documentation for Rubocop overrides (#23811)

cb2ce842 — Nick Schonning 3 years ago
Autofix  Rubocop Rails/IgnoredColumnsAssignment (#23761)

7646ad8a — Vyr Cossont 3 years ago
IndexingScheduler: fetch and import in batches (#24285)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
500d6f93 — Nick Schonning 3 years ago
Autofix Rubocop Style/IdenticalConditionalBranches (#24322)

83fc9728 — Nick Schonning 3 years ago
Enable Rubocop Metrics/BlockLength with Excludes (#24260)

b4f38edf — Christian Schmidt 3 years ago
Wrong type for user setting when default is defined by lambda (#24321)

68a192e7 — Eugen Rochko 3 years ago
Change "direct message" nomenclature to "private mention" in web UI (#24248)

a9b5598c — Eugen Rochko 3 years ago
Change user settings to be stored in a more optimal way (#23630)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
e7c3e558 — Claire 3 years ago
Fix stale apt index in github actions (#24319)

67450cf0 — dependabot[bot] 3 years ago
Bump cssnano from 5.1.15 to 6.0.0 (#24296)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
74f56c64 — Tdxdxoz 3 years ago
Fix: set multiColumn value for /explore Statuses (#24314)

9c845630 — mogamin 3 years ago
Fix missing translation in pagination gap tags (#24262)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
cb9cc09a — Robert R George 3 years ago
Fixes launching of the devcontainer and adds support for Docker Desktop (#24303)

c855e1ec — dependabot[bot] 3 years ago
Bump sass from 1.59.3 to 1.60.0 (#24292)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
550d40a3 — dependabot[bot] 3 years ago
Bump rimraf from 4.4.0 to 4.4.1 (#24291)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ef52da6d — dependabot[bot] 3 years ago
Bump react-textarea-autosize from 8.4.0 to 8.4.1 (#24293)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
eb38e9df — Christian Schmidt 3 years ago
Requeue expiration notification (#24311)

Next