Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
This commit is contained in:
Thibaut Girka 2019-07-23 10:17:06 +02:00
commit 444796b69b
76 changed files with 662 additions and 590 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/oauth/authorized_applications_controller.rb
View file

@ -8,6 +8,8 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
before_action :set_pack
before_action :set_body_classes
skip_before_action :require_functional!
include Localized
def destroy