Upstream sync

2020-07-02 10:34:24 +02:00
parent e49498bbbf
commit d6a3542308
2 changed files with 9 additions and 7 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -84,7 +84,7 @@ class Account < ApplicationRecord
  end

  def taskme_enabled?
-    plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme"
+    ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
  end

  def plan_name