Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
      app/javascript/styles/mastodon/components.scss
This commit is contained in:
David Yip 2018-02-02 08:39:52 -06:00
commit 4c1fd9a19c
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
30 changed files with 244 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/statuses_controller.rb
View file

@ -1,6 +1,7 @@
# frozen_string_literal: true
class StatusesController < ApplicationController
include SignatureAuthentication
include Authorization
layout 'public'