You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/controllers
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2 years ago
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
admin Add back missing glitch-soc admin settings (#1919) 2 years ago
api Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
auth Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
concerns Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
disputes Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2 years ago
oauth Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
settings Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
well_known
about_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
authorize_interactions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
custom_css_controller.rb Add customizable user roles (#18641) 2 years ago
emojis_controller.rb
filters_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
following_accounts_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
health_controller.rb
home_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
instance_actors_controller.rb Fix instance actor not being dereferenceable (#17457) 2 years ago
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb Refactor how Redis locks are created (#18400) 2 years ago
privacy_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
relationships_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
tags_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago