Merge remote-tracking branch 'upstream/stable'

Author: thelostone-mc

app/grants/templatetags/grants_extra.py

@@ -57,8 +57,9 @@ def modulo(num, val):
         int: The modulo of number and value.
 
     """
-
-    return num % val
+    if num and val:
+        return num % val
+    return 0
 
 @register.simple_tag
 def is_team_member(grant, profile):

app/perftools/management/commands/create_jtbd_cache.py

@@ -52,7 +52,8 @@ def create_jtbd_earn_cache():
     thirty_days_ago = timezone.now() - datetime.timedelta(days=30)
 
     bounties = list(Bounty.objects.filter(
-        network='mainnet', event=None, idx_status='open', created_on__gt=thirty_days_ago
+        network='mainnet', event=None, idx_status='open', created_on__gt=thirty_days_ago,
+        current_bounty=True
     ).order_by('-_val_usd_db').extra(
         select={'val_usd_db': '_val_usd_db'}
     ).values(

scripts/crontab

@@ -104,7 +104,10 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 30 * * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash create_gas_history  >> /var/log/gitcoin/create_gas_history.log  2>&1
 0 19 * * 7 cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash vacuum  >> /var/log/gitcoin/vacuum.log  2>&1
 2 */3 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash create_page_cache  >> /var/log/gitcoin/create_page_cache.log  2>&1
-30 */3 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash create_jtbd_cache  >> /var/log/gitcoin/create_jtbd_cache.log  2>&1
+
+# every day at 6PM
+0 18 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash create_jtbd_cache  >> /var/log/gitcoin/create_jtbd_cache.log  2>&1
+
 1 */30 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash create_activity_cache  >> /var/log/gitcoin/create_activity_cache.log  2>&1