mastodon/config/initializers
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
..
active_model_serializers.rb Add recursive object support to API response (#4095) 2017-07-07 14:12:16 +02:00
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
cookies_serializer.rb
devise.rb Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587) 2017-08-12 16:30:59 +02:00
doorkeeper.rb Application prefs section (#2758) 2017-08-22 18:33:57 +02:00
fast_blank.rb
filter_parameter_logging.rb
frontends.rb Multiple frontend support (#110) 2017-07-30 19:28:21 +02:00
httplog.rb
inflections.rb Add ActivityPub inbox (#4216) 2017-08-08 21:52:15 +02:00
instrumentation.rb
json_ld.rb Use updated ActivityStreams context (added: sharedInbox) (#4764) 2017-09-02 14:00:58 +02:00
kaminari_config.rb
mime_types.rb Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
oembed.rb
open_uri_redirection.rb
ostatus.rb swift-enable the paperclip! 📎 (#2322) 2017-09-05 23:17:06 +02:00
pagination.rb
paperclip.rb swift-enable the paperclip! 📎 (#2322) 2017-09-05 23:17:06 +02:00
rabl_init.rb
rack_attack.rb Add Content-Type header on throttled response to fix mojibake (#4558) 2017-08-08 15:47:35 +02:00
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836) 2017-09-07 16:44:14 +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
timeout.rb
trusted_proxies.rb
vapid.rb Add Rake task for generate VAPID key (#4195) 2017-07-14 12:13:43 +02:00
wrap_parameters.rb