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 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		7 years ago
..
active_model_serializers.rb	Disable AMS logging (#7623)	7 years ago
application_controller_renderer.rb	…
assets.rb	HTML e-mails for UserMailer (#6256)	7 years ago
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	Fix #6509: Use pull queue for chewy jobs (#6513)	7 years ago
content_security_policy.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
cookies_serializer.rb	…
cors.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
devise.rb	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)	7 years ago
doorkeeper.rb	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago
fast_blank.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	User agent for WebFinger (#7531)	7 years ago
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
kaminari_config.rb	…
locale.rb	Ruby intl8n for themes	7 years ago
mime_types.rb	…
oj.rb	Remove rabl dependency (#5894)	7 years ago
omniauth.rb	Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)	7 years ago
open_uri_redirection.rb	…
ostatus.rb	enforce LOCAL_HTTPS=true in production (#6061)	7 years ago
pagination.rb	…
paperclip.rb	Improve OpenStack v3 compatibility (#7392)	7 years ago
premailer_rails.rb	HTML e-mails for UserMailer (#6256)	7 years ago
rack_attack.rb	Add a missing question mark in rack_attack.rb (#7338)	7 years ago
rack_attack_logging.rb	Log rate limit hits (#7096)	7 years ago
redis.rb	…
session_activations.rb	…
session_store.rb	Fix enforce HTTPS in production. (#6180)	7 years ago
sidekiq.rb	Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)	7 years ago
simple_form.rb	…
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	Add a circuit breaker for ActivityPub deliveries (#7053)	7 years ago
strong_migrations.rb	…
suppress_csrf_warnings.rb	Suppress CSRF token warnings (#6240)	7 years ago
timeout.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Fix URLs incorrectly having trailing hyphen removed (#6465)	7 years ago
vapid.rb	…
wrap_parameters.rb	…