Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
1_hosts.rb
active_model_serializers.rb
application_controller_renderer.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
assets.rb
backtrace_silencers.rb	Initial commit	2016-02-20 22:53:20 +01:00
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
cookies_serializer.rb
cors.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
delivery_job.rb
devise.rb
doorkeeper.rb
fast_blank.rb
ffmpeg.rb	add ffmpeg initializer (#8855)	2018-10-09 03:02:52 +02:00
filter_parameter_logging.rb	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
http_client_proxy.rb
httplog.rb
inflections.rb
instrumentation.rb	Improve StatsD instrumentation	2017-01-26 19:08:05 +01:00
json_ld.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
open_uri_redirection.rb
pagination.rb
paperclip.rb
premailer_rails.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
rack_attack.rb
rack_attack_logging.rb	Bump rack-attack from 5.4.2 to 6.0.0 (#10599)	2019-05-03 16:16:11 +02:00
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb
simple_form.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
single_user_mode.rb	Add single user mode	2016-12-06 17:19:26 +01:00
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
wrap_parameters.rb