tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
This commit is contained in:
Thibaut Girka committed 2019-07-30 12:22:33 +02:00
2 parents f48c7689d2 b31b232edf
commit 24968d20a0
59 files changed
+779 -221
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/remote_interaction_controller.rb
+1
View File
@@ -5,6 +5,7 @@ class RemoteInteractionController < ApplicationController
layout 'modal'
before_action :authenticate_user!, if: :whitelist_mode?
before_action :set_interaction_type
before_action :set_status
before_action :set_body_classes