Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Browse source 
Conflicts:
      app/javascript/styles/mastodon/components.scss
This commit is contained in:
David Yip 2018-02-02 08:39:52 -06:00
commit 4c1fd9a19c
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
30 changed files with 244 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -15,6 +15,7 @@ class ApplicationController < ActionController::Base
helper_method :current_flavour
helper_method :current_skin
helper_method :single_user_mode?
helper_method :use_pam?
rescue_from ActionController::RoutingError, with: :not_found
rescue_from ActiveRecord::RecordNotFound, with: :not_found
@ -145,6 +146,10 @@ class ApplicationController < ActionController::Base
@single_user_mode ||= Rails.configuration.x.single_user_mode && Account.exists?
end
def use_pam?
Devise.pam_authentication
end
def current_account
@current_account ||= current_user.try(:account)
end