This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2020-08-30 16:13:08 +02: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
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	✨ Add an LDAP Mail attribute config (#12053)	2019-12-01 18:52:21 +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	…
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
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	Fix remote files not using Content-Type header, streaming (#14184)	2020-06-30 23:58:02 +02:00
premailer_rails.rb	…
rack_attack.rb	Change rate limits for various paths (#14253)	2020-07-07 15:26:39 +02:00
rack_attack_logging.rb	Change rate limits for various paths (#14253)	2020-07-07 15:26:39 +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	…
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 magnet: URIs (#12905)	2020-01-23 21:27:26 +01:00
vapid.rb	…
webauthn.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
wrap_parameters.rb	…