From: href <href+git-pleroma@random.sh>
Date: Fri, 14 Dec 2018 20:22:24 +0000 (+0000)
Subject: Merge branch '114_email_invites' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bfe27c1b557b19c171c8168c5f1244987246c47f;p=akkoma

Merge branch '114_email_invites' into 'develop'

[#114] Email invites

See merge request pleroma/pleroma!541
---

bfe27c1b557b19c171c8168c5f1244987246c47f
diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
index a8e3467c4,fb3b99d25..2f2b69623
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@@ -170,10 -164,10 +170,11 @@@ defmodule Pleroma.Web.TwitterAPI.UtilCo
            description: Keyword.get(instance, :description),
            server: Web.base_url(),
            textlimit: to_string(Keyword.get(instance, :limit)),
 +          uploadlimit: uploadlimit,
            closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
            private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
-           vapidPublicKey: vapid_public_key
+           vapidPublicKey: vapid_public_key,
+           invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0")
          }
  
          pleroma_fe = %{