mastodon/app/controllers/settings/base_controller.rb at 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 - luna/mastodon - femgit

luna/mastodon

mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-09 16:35:48 +00:00

Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.

2018-10-26 20:41:43 +02:00

18 lines

308 B

Ruby

Raw Blame History

 # frozen_string_literal: true
 class Settings::BaseController < ApplicationController
   layout 'admin'
   before_action :authenticate_user!
   before_action :set_pack
   before_action :set_body_classes
   def set_pack
     use_pack 'settings'
   end
   def set_body_classes
     @body_classes = 'admin'
   end
 end