Merge branch 'dev_educoder' into educoder_server

app/controllers/settings_controller.rb

@@ -4,19 +4,16 @@ class SettingsController < ApplicationController
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
 
     @add =  Site.add.select(:id, :name, :url, :key)
-    @personal =
-      if User.current.logged?
-        arr =[]
-        Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-          hash = {}
-          site.each {|k, v|
-            hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
-          }
-          arr << hash
-        end
-      else
-        []
+    @personal = []
+    if User.current.logged?
+      Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+        hash = {}
+        site.each {|k, v|
+          hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+        }
+        @personal << hash
       end
+    end
 
     @common = []
     Site.common.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|