Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.

2020-12-15 14:27:06 +01:00

..

0_duplicate_migrations.rb

Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations

2020-02-10 20:04:41 +01:00

0_post_deployment_migrations.rb

…

1_hosts.rb

…

2_whitelist_mode.rb

Remove the terms blacklist and whitelist from UX (#14149)

2020-06-27 20:20:11 +02:00

active_model_serializers.rb

…

application_controller_renderer.rb

…

assets.rb

…

backtrace_silencers.rb

…

blacklists.rb

Remove the terms blacklist and whitelist from UX (#14149)

2020-06-27 20:20:11 +02:00

cache_buster.rb

Add cache buster feature for media files (#15155)

2020-11-19 17:38:06 +01:00

chewy.rb

Fix workaround for Elasticsearch 7.x (#13828)

2020-05-23 05:48:14 +02:00

content_security_policy.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-07-07 15:58:45 +02:00

cookies_serializer.rb

…

cors.rb

…

delivery_job.rb

…

devise.rb

Fix cookies not having a SameSite attribute (#15098)

2020-11-06 11:57:14 +01:00

doorkeeper.rb

Add E2EE API (#13820)

2020-06-02 19:24:53 +02:00

fast_blank.rb

…

ffmpeg.rb

…

filter_parameter_logging.rb

…

health_check.rb

Hide error message on /heath (#11947)

2019-09-24 20:28:25 +02:00

http_client_proxy.rb

Refactor monkey-patching of Goldfinger (#12561)

2020-05-10 11:41:43 +02:00

httplog.rb

…

inflections.rb

Add E2EE API (#13820)

2020-06-02 19:24:53 +02:00

json_ld.rb

Fix preloaded JSON-LD context for identity not being used (#12138)

2019-10-10 06:48:53 +02:00

kaminari_config.rb

Add ability to filter audit log in admin UI (#13381)

2020-04-03 13:06:34 +02:00

locale.rb

Move glitch-specific ruby-side locales to their own files

2020-05-30 12:54:17 +02:00

makara.rb

Fix cookies not having a SameSite attribute (#15098)

2020-11-06 11:57:14 +01:00

mime_types.rb

…

oj.rb

…

omniauth.rb

…

open_uri_redirection.rb

…

pagination.rb

…

paperclip.rb

Add stoplight for object storage failures, return HTTP 503 (#13043)

2020-12-15 12:55:29 +01:00

premailer_rails.rb

…

rack_attack_logging.rb

Change rate limits for various paths (#14253)

2020-07-07 15:26:39 +02:00

rack_attack.rb

Add IP-based rules (#14963)

2020-10-12 16:33:49 +02:00

redis.rb

Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)

2020-07-01 19:05:21 +02:00

session_activations.rb

…

session_store.rb

Fix cookies not having a SameSite attribute (#15098)

2020-11-06 11:57:14 +01:00

sidekiq.rb

Fix background jobs not using locks like they are supposed to (#13361)

2020-03-31 21:59:03 +02:00

simple_form.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

single_user_mode.rb

…

statsd.rb

…

stoplight.rb

…

strong_migrations.rb

…

suppress_csrf_warnings.rb

…

trusted_proxies.rb

…

twitter_regex.rb

Add support for Gemini urls (#15013)

2020-10-19 17:02:13 +02:00

vapid.rb

…

webauthn.rb

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

wrap_parameters.rb

…