David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-02-02 08:39:52 -06: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

…

cookies_serializer.rb

…

devise.rb

pam authentication (#5303)

2018-02-02 10:18:55 +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

…

open_uri_redirection.rb

…

ostatus.rb

enforce LOCAL_HTTPS=true in production (#6061)

2017-12-22 02:17:59 +01:00

pagination.rb

…

paperclip.rb

…

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

…

simple_form.rb

…

single_user_mode.rb

…

statsd.rb

…

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

…

vapid.rb

…

wrap_parameters.rb

…