Merge branch 'v2.2.1-alpha' into master

2019-07-23 15:57:08 -04:00
parent 0b64acaecf 0a6bce1384
commit f7c88cfc6a
77 changed files with 1740 additions and 921 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -107,7 +107,7 @@ module ApplicationHelper
  # Returns the page that the logo redirects to when clicked on
  def home_page
    return root_path unless current_user
-    return admins_path if current_user.has_role? :super_admin
+    return admins_path if current_user.has_cached_role? :super_admin
    current_user.main_room
  end
 end