masto-fe/lib
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
active_record Apply Rubocop Performance/BindCall (#23437) 2023-02-08 09:10:25 +09:00
assets Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
chewy/strategy Change search indexing to use batches to minimize resource usage (#18451) 2022-05-18 23:29:14 +02:00
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
paperclip Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
rails Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
sanitize_ext Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
simple_navigation Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
terrapin Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
webpacker Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
cli.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
exceptions.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00