closed-social
/
mastodon
3
0
Fork 2
Code Issues 5 Pull Requests 0 Projects 0 Releases 3 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
8297 Commits
4 Branches
567 MiB
Tree: eb481c9049
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'eb481c9049'
${ noResults }
mastodon/app/controllers/settings/base_controller.rb

17 lines
308 B
Raw Normal View History

Finalized theme loading and stuff
7 years ago
​
​
​
​
​
​
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.
6 years ago
Finalized theme loading and stuff
7 years ago
​
​
​
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.
6 years ago
​
​
​
Finalized theme loading and stuff
7 years ago
 
  1. # frozen_string_literal: true
  2. 

  3. class Settings::BaseController < ApplicationController
  4.   layout 'admin'
  5. 

  6.   before_action :authenticate_user!
  7.   before_action :set_pack
  8.   before_action :set_body_classes
  9. 

  10.   def set_pack
  11.     use_pack 'settings'
  12.   end
  13. 

  14.   def set_body_classes
  15.     @body_classes = 'admin'
  16.   end
  17. end