You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
0_duplicate_migrations.rb	Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations	5 years ago
0_post_deployment_migrations.rb	…
1_hosts.rb	…
2_whitelist_mode.rb	Remove the terms blacklist and whitelist from UX (#14149)	4 years ago
active_model_serializers.rb	Fix ActivityPub context not being dynamically computed (#11746)	5 years ago
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	Remove the terms blacklist and whitelist from UX (#14149)	4 years ago
chewy.rb	Fix workaround for Elasticsearch 7.x (#13828)	5 years ago
content_security_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
cookies_serializer.rb	…
cors.rb	…
delivery_job.rb	…
devise.rb	✨ Add an LDAP Mail attribute config (#12053)	5 years ago
doorkeeper.rb	Add E2EE API (#13820)	5 years ago
fast_blank.rb	…
ffmpeg.rb	…
filter_parameter_logging.rb	…
health_check.rb	Hide error message on /heath (#11947)	5 years ago
http_client_proxy.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
httplog.rb	…
inflections.rb	Add E2EE API (#13820)	5 years ago
json_ld.rb	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
kaminari_config.rb	Add ability to filter audit log in admin UI (#13381)	5 years ago
locale.rb	Move glitch-specific ruby-side locales to their own files	5 years ago
mime_types.rb	…
oj.rb	…
omniauth.rb	cas_options :validate_url should be :service_validate_url (#10328)	6 years ago
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	Fix remote files not using Content-Type header, streaming (#14184)	4 years ago
premailer_rails.rb	…
rack_attack.rb	Change rate limits for various paths (#14253)	4 years ago
rack_attack_logging.rb	Change rate limits for various paths (#14253)	4 years ago
redis.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
session_activations.rb	…
session_store.rb	…
sidekiq.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
simple_form.rb	Add announcements (#12662)	5 years ago
single_user_mode.rb	…
statsd.rb	Remove unused StatsD code and expose StatsD as a global variable (#11232)	5 years ago
stoplight.rb	Fix stoplight logging to stderr separate from Rails logger (#10624)	6 years ago
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Add support for magnet: URIs (#12905)	5 years ago
vapid.rb	…
webauthn.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
wrap_parameters.rb	…