Merge branch 'trustie_server' into dev_educoder

app/controllers/settings_controller.rb

@@ -22,6 +22,7 @@ class SettingsController < ApplicationController
     Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
       hash = {}
       site.each {|k, v|
+        next if v.to_s.include?("current_user") && !User.current_user.logged?
         hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
       }
       @common << hash