Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency		2020-06-17 17:10:15 +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
active_model_serializers.rb
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
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-05-10 16:19:56 +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 csv upload (#13835)	2020-05-24 09:15:23 +02:00
premailer_rails.rb
rack_attack.rb	Fix re-sending of e-mail confirmation not being rate limited (#13360)	2020-03-31 18:20:48 +02:00
rack_attack_logging.rb
redis.rb	Suppress Redis#exists(key) warning (#14067)	2020-06-17 10:31:31 +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
wrap_parameters.rb