Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
parent ad3a2dfb66 33f56811e3
commit 4c1fd9a19c
30 changed files with 244 additions and 95 deletions
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true

 class StatusesController < ApplicationController
+  include SignatureAuthentication
  include Authorization

  layout 'public'