Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		2018-05-27 13:20:15 +02:00
..
active_model_serializers.rb	Disable AMS logging (#7623)	2018-05-26 01:08:31 +02:00
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb
content_security_policy.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
cookies_serializer.rb
cors.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05:00
devise.rb	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)	2018-03-20 19:41:51 +01:00
doorkeeper.rb	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
fast_blank.rb
filter_parameter_logging.rb
http_client_proxy.rb	User agent for WebFinger (#7531)	2018-05-18 01:47:22 +02:00
httplog.rb
inflections.rb
instrumentation.rb
kaminari_config.rb
locale.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
ostatus.rb
pagination.rb
paperclip.rb	Improve OpenStack v3 compatibility (#7392)	2018-05-07 02:28:28 +02:00
premailer_rails.rb
rack_attack.rb	Add a missing question mark in rack_attack.rb (#7338)	2018-05-03 18:51:00 +02:00
rack_attack_logging.rb	Log rate limit hits (#7096)	2018-04-10 01:20:18 +02:00
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb	Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)	2018-04-10 16:08:28 +02:00
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb	Add a circuit breaker for ActivityPub deliveries (#7053)	2018-04-07 21:36:58 +02:00
strong_migrations.rb
suppress_csrf_warnings.rb
timeout.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
wrap_parameters.rb