David Yip 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		2018-04-08 19:05:02 -05:00
..
active_model_serializers.rb	…
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
cookies_serializer.rb	…
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	…
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
json_ld.rb	…
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oembed.rb	…
oj.rb	…
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	…
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	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
rack_attack.rb	Increase rate limit on protected paths (#6229)	2018-01-09 17:07:54 +01: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	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	2018-02-24 19:16:11 +01: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
timeout.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Fix URLs incorrectly having trailing hyphen removed (#6465)	2018-02-11 23:49:18 +01:00
vapid.rb	…
wrap_parameters.rb	…