Merge pull request #488 from CaptainFact/staging

misc fixes (#487)

apps/cf_jobs/lib/application.ex

@@ -23,7 +23,7 @@ defmodule CF.Jobs.Application do
 
     # Do not start scheduler in tests
     children =
-      if env == :test,
+      if env == :test or Application.get_env(:cf, :disable_scheduler),
         do: children,
         else: children ++ [worker(CF.Jobs.Scheduler, [])]
 

apps/db/lib/db_schema/user.ex

@@ -86,8 +86,19 @@ defmodule DB.Schema.User do
     |> common_changeset(params)
     |> validate_length(:password, min: 6, max: 256)
     |> put_encrypted_pw
+    |> set_unconfirmed_if_new_email(model, params)
   end
 
+  defp set_unconfirmed_if_new_email(changeset, model, %{"email" => email}) do
+    if model && !is_nil(email) && email != model.email do
+      put_change(changeset, :email_confirmed, false)
+    else
+      changeset
+    end
+  end
+
+  defp set_unconfirmed_if_new_email(changeset, _model, _params), do: changeset
+
   @doc """
   Generate a changeset to update `reputation` and `today_reputation_gain` without verifying daily limits
   """