Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix admin dashboard missing latest features (#11505)

Browse source 
Fix redis-namespace deprecation warning about administrative commands
This commit is contained in:
Eugen Rochko 2019-08-06 19:40:06 +02:00 • committed by GitHub
parent 9072fe5ab6
commit dd38c280a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/admin/dashboard_controller.rb
View file

@ -28,9 +28,12 @@ module Admin
@pam_enabled = ENV['PAM_ENABLED'] == 'true'
@hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
@trending_hashtags = TrendingTags.get(10, filtered: false)
@authorized_fetch = authorized_fetch_mode?
@whitelist_enabled = whitelist_mode?
@profile_directory = Setting.profile_directory
@timeline_preview = Setting.timeline_preview
@spam_check_enabled = Setting.spam_check_enabled
@trends_enabled = Setting.trends
end
private
@ -40,7 +43,13 @@ module Admin
end
def redis_info
@redis_info ||= Redis.current.info
@redis_info ||= begin
if Redis.current.is_a?(Redis::Namespace)
Redis.current.redis.info
else
Redis.current.info
end
end
end
end
end