Unfloyded/Legamunt
0
0
Fork 0
Code 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 2019-07-30 12:22:33 +02:00
commit 24968d20a0
59 changed files with 779 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/remote_interaction_controller.rb
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