Merge branch 'master' into glitch-soc/merge-upstream

2020-12-09 14:42:33 +01:00
parent 25f725d67a 127c543a6e
commit a16175645d
23 changed files with 235 additions and 212 deletions
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -51,7 +51,7 @@ class Form::AccountBatch
  end

  def account_domains
-    accounts.pluck(Arel.sql('distinct domain')).compact
+    accounts.group(:domain).pluck(:domain).compact
  end

  def accounts