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

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

backtrace_silencers.rb

…

blacklists.rb

Quick best practice cleanup of views/helpers (#1546)

2017-04-12 18:24:18 +02:00

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

fix can toot whitespace (#2218)

2017-04-22 19:48:55 +02:00

filter_parameter_logging.rb

…

frontends.rb

Multiple frontend support (#110)

2017-07-30 19:28:21 +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

…

json_ld.rb

Use updated ActivityStreams context (added: sharedInbox) (#4764)

2017-09-02 14:00:58 +02:00

kaminari_config.rb

OEmbed support for PreviewCard (#2337)

2017-04-27 14:42:22 +02:00

mime_types.rb

Set correct content-type for ActivityPub JSON (#4592)

2017-08-14 04:16:43 +02:00

oembed.rb

OEmbed support for PreviewCard (#2337)

2017-04-27 14:42:22 +02:00

open_uri_redirection.rb

…

ostatus.rb

swift-enable the paperclip! 📎 (#2322)

2017-09-05 23:17:06 +02:00

pagination.rb

Pagination improvements (#1445)

2017-04-11 01:11:41 +02:00

paperclip.rb

swift-enable the paperclip! 📎 (#2322)

2017-09-05 23:17:06 +02:00

rabl_init.rb

Make sure Rabl is using Oj

2017-04-05 19:29:30 +02:00

rack_attack.rb

Add Content-Type header on throttled response to fix mojibake (#4558)

2017-08-08 15:47:35 +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

…

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

…