From d6a3542308a692a60aca39b6913f795a93da3f2d Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Thu, 2 Jul 2020 10:34:24 +0200
Subject: [PATCH] Upstream sync

---
 app/models/account.rb                   |  2 +-
 app/views/application/_sidebar.html.erb | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 826eb1c..de3a812 100644
--- 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
diff --git a/app/views/application/_sidebar.html.erb b/app/views/application/_sidebar.html.erb
index df75cad..b6b0cbf 100644
--- a/app/views/application/_sidebar.html.erb
+++ b/app/views/application/_sidebar.html.erb
@@ -11,12 +11,14 @@
   <hr class="divider-light mx-n4">
   <nav>
     <ul class="nav nav-pills nav-pills-dark flex-column">
-      <li class="nav-item">
-        <%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %>
-          <%= lock_icon_for(Current.account, :taskme) %>
-          <%= product_wordmark :task_me, class: class_string("d-inline-block", "disabled" => !Current.account.taskme_enabled?) %>
-        <% end %>
-      </li>
+      <% if Current.account.taskme_enabled? %>
+        <li class="nav-item">
+          <%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %>
+            <%= lock_icon_for(Current.account, :taskme) %>
+            <%= product_wordmark :task_me, class: class_string("d-inline-block", "disabled" => !Current.account.taskme_enabled?) %>
+          <% end %>
+        </li>
+      <% end %>
       <li class="nav-item">
         <%= link_to [project, :contract_templates], class: class_string("nav-link", "active" => %w(contract_templates release_template_imports).include?(controller_name)) do %>
           <%= lock_icon_for Current.account, :releaseme %>