Merge branch 'standalone_develop' into pre_trustie_server

app/controllers/settings_controller.rb

@@ -32,9 +32,9 @@ class SettingsController < ApplicationController
 
   def get_sub_competitions
     @sub_competitions = []
-    Site.add.pluck(:key).each do |key|
+    Site.competition.pluck(:key).each do |key|
       hash = {}
-      hash.merge!("#{key.to_s}": Site.add.where(key: key).select(:id, :name, :url, :key).to_a.map(&:serializable_hash))
+      hash.merge!("#{key.to_s}": Site.competition.where(key: key).select(:id, :name, :url, :key).to_a.map(&:serializable_hash))
       @sub_competitions << hash
     end
   end