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
This commit is contained in:
Thibaut Girka
2018-10-27 18:54:26 +02:00
parent 5bb8563f6c eef8d9a5f7
commit c13cfeac09
6 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/auth/registrations_controller.rb
View File

@@ -9,7 +9,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
before_action :set_pack
before_action :set_sessions, only: [:edit, :update]
before_action :set_instance_presenter, only: [:new, :create, :update]
before_action :set_body_classes, only: [:new, :create]
before_action :set_body_classes, only: [:new, :create, :edit, :update]
def destroy
not_found
@@ -86,7 +86,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
end
def set_body_classes
@body_classes = 'lighter'
@body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
end
def set_invite