mastodon/config/initializers
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +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 Quick best practice cleanup of views/helpers (#1546) 2017-04-12 18:24:18 +02:00
chewy.rb Fix #6509: Use pull queue for chewy jobs (#6513) 2018-02-20 17:25:16 +01:00
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 more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
fast_blank.rb fix can toot whitespace (#2218) 2017-04-22 19:48:55 +02:00
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 Version bumps for ruby and misc gems (#1159) 2017-04-10 22:47:41 +02:00
inflections.rb Add ActivityPub inbox (#4216) 2017-08-08 21:52:15 +02:00
instrumentation.rb
kaminari_config.rb adjust public profile pages 2 (#5223) 2017-10-04 22:49:36 +02:00
locale.rb Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
mime_types.rb Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
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
ostatus.rb enforce LOCAL_HTTPS=true in production (#6061) 2017-12-22 02:17:59 +01:00
pagination.rb Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
paperclip.rb Improve OpenStack v3 compatibility (#7392) 2018-05-07 02:28:28 +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 Set config.cache_store in environments file. (#3219) 2017-05-22 15:01:02 +02:00
session_activations.rb Revocable sessions (#3616) 2017-06-23 18:50:53 +02:00
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 Improve UI of admin site settings (#4163) 2017-07-12 03:24:04 +02:00
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 Fix migration failure due to StrongMigrations on production env (#5283) 2017-10-09 10:05:35 +02:00
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 Add Rake task for generate VAPID key (#4195) 2017-07-14 12:13:43 +02:00
wrap_parameters.rb