Merge remote-tracking branch 'origin/stable'

Author: gdixon

.github/workflows/ci-review-cleanup.yml

@@ -5,7 +5,7 @@ name: Cleanup review environment
 on:
   pull_request:
     types: [ closed ]
-    branches: [ master ]
+    branches: [ master, stable ]
 
 jobs:
   cleanup:

.github/workflows/ci-review.yml

@@ -3,7 +3,7 @@ name: Setup review environment
 on:
   # run it during pull request
   pull_request:
-    branches: [ master ]
+    branches: [ master, stable ]
 
 jobs:
   build-and-test:

app/app/local.env

@@ -86,3 +86,6 @@ NETWORK_NAME=localhost
 SECRET_WORDS=
 PASSWORD=
 CYPRESS_REMOTE_DEBUGGING_PORT=9222
+
+# Datadog token for UI logging
+DATADOG_TOKEN=

app/app/settings.py

@@ -543,6 +543,11 @@ def callback(request):
     ('grants.tasks.batch_process_grant_contributions', {'queue': 'high_priority'}),
     ('kudos.tasks.mint_token_request', {'queue': 'high_priority'}),
     ('dashboard.tasks.increment_view_count', {'queue': 'analytics'}),
+    ('dashboard.tasks.record_visit', {'queue': 'analytics'}),
+    ('dashboard.tasks.record_join', {'queue': 'analytics'}),
+    ('townsquare.tasks.increment_offer_view_counts', {'queue': 'analytics'}),
+    ('townsquare.tasks.increment_view_counts', {'queue': 'analytics'}),
+    ('townsquare.tasks.send_comment_email', {'queue': 'marketing'}),
     ('marketing.tasks.*', {'queue': 'marketing'}),
     ('grants.tasks.*', {'queue': 'default'}),
     ('dashboard.tasks.*', {'queue': 'default'}),
@@ -958,3 +963,6 @@ def callback(request):
 # Generating a checksun is optional. When egenerating the static files for a container build
 # we do not want to add a checksum
 BUNDLE_USE_CHECKSUM = env('BUNDLE_USE_CHECKSUM', default=True)
+
+# Datadog token for UI logging
+DATADOG_TOKEN = env('DATADOG_TOKEN', default=None)

app/app/urls.py

@@ -77,6 +77,7 @@
 
     # board
     re_path(r'^dashboard/?', dashboard.views.board, name='dashboard'),
+    re_path(r'^passport/?', dashboard.views.passport, name='passport'),
 
     # kudos
     re_path(r'^kudos/?$', kudos.views.about, name='kudos_main'),
@@ -150,6 +151,11 @@
         dashboard.views.verify_passport,
         name='verify_passport'
     ),
+    url(
+        r'^api/v2/profile/(?P<handle>.*)/passport/unlink',
+        dashboard.views.unlink_passport,
+        name='unlink_passport'
+    ),
     url(
         r'^api/v2/profile/(?P<handle>.*)/passport/trust_bonus',
         dashboard.views.get_passport_trust_bonus,