Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		2018-08-26 14:23:24 +02:00
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
1_hosts.rb	Tighten CSP while allowing CDN hosts	2018-08-23 22:58:40 +02:00
active_model_serializers.rb	Disable AMS logging (#7623)	2018-05-26 01:08:31 +02:00
application_controller_renderer.rb	…
assets.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	Fix #6509: Use pull queue for chewy jobs (#6513)	2018-02-20 17:25:16 +01:00
content_security_policy.rb	Only apply CSP in production mode	2018-08-23 22:58:40 +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 search filter (#8151)	2018-08-15 18:12:44 +02:00
doorkeeper.rb	Introduce OAuth scopes for bookmarks	2018-08-10 16:49:06 +02:00
fast_blank.rb	…
filter_parameter_logging.rb	…
http_client_proxy.rb	Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)	2018-06-29 15:36:02 +02:00
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
kaminari_config.rb	…
locale.rb	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
mime_types.rb	…
oj.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00
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)	2018-03-07 06:19:10 +01:00
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	2018-08-25 13:27:08 +02:00
premailer_rails.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
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	Fix enforce HTTPS in production. (#6180)	2018-01-05 20:04:22 +01:00
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	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
trusted_proxies.rb	…
twitter_regex.rb	Add dat, dweb, ipfs, ipns, ssb, gopher protocols to URL extractor (#7810)	2018-06-15 20:21:47 +02:00
vapid.rb	…
wrap_parameters.rb	…