mastodon/config/initializers
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
active_model_serializers.rb
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
fast_blank.rb
filter_parameter_logging.rb
http_client_proxy.rb HTTP proxy support for outgoing request, manage access to hidden service (#7134) 2018-04-25 02:14:49 +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
omniauth.rb
open_uri_redirection.rb
ostatus.rb
pagination.rb
paperclip.rb Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) 2018-03-24 12:52:45 +01: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 Allow specifying STATSD_NAMESPACE (#5700) 2017-11-15 07:22:43 +09:00
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
timeout.rb Add proper error page for request timeouts 2017-04-02 19:43:44 +02:00
trusted_proxies.rb
twitter_regex.rb
vapid.rb
wrap_parameters.rb