merge conflictx

.dockerignore

@@ -0,0 +1,5 @@
+draft.toml
+charts/
+NOTICE
+LICENSE
+README.md

.helmignore

@@ -0,0 +1,27 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+*.png
+
+# known compile time folders
+target/
+node_modules/
+vendor/

Dockerfile

@@ -30,6 +30,7 @@ RUN mkdir -p /usr/share/GeoIP/ && \
 
 WORKDIR /code
 COPY requirements/ /code/
+COPY app/ /code/app/
 
 RUN pip install -r test.txt
 COPY bin/docker-command.bash /bin/docker-command.bash

Jenkinsfile

@@ -0,0 +1,86 @@
+pipeline {
+    agent {
+        label "jenkins-python"
+    }
+    environment {
+      ORG               = 'gitcoinco'
+      APP_NAME          = 'web'
+      CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
+    }
+    stages {
+      stage('CI Build and push snapshot') {
+        when {
+          branch 'PR-2393'
+        }
+        environment {
+          PREVIEW_VERSION = "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER"
+          PREVIEW_NAMESPACE = "$APP_NAME-$BRANCH_NAME".toLowerCase()
+          HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase()
+        }
+        steps {
+          container('python') {
+            sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'
+
+
+            sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION"
+          }
+
+          dir ('./charts/preview') {
+           container('python') {
+             sh "make preview"
+             sh "jx preview --app $APP_NAME --dir ../.."
+           }
+          }
+        }
+      }
+      stage('Build Release') {
+        when {
+          branch 'master'
+        }
+        steps {
+          container('python') {
+            // ensure we're not on a detached head
+            sh "git checkout master"
+            sh "git config --global credential.helper store"
+
+            sh "jx step git credentials"
+            // so we can retrieve the version in later steps
+            sh "echo \$(jx-release-version) > VERSION"
+          }
+          dir ('./charts/web') {
+            container('python') {
+              sh "make tag"
+            }
+          }
+          container('python') {
+            sh 'export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml'
+
+            sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)"
+          }
+        }
+      }
+      stage('Promote to Environments') {
+        when {
+          branch 'master'
+        }
+        steps {
+          dir ('./charts/web') {
+            container('python') {
+              sh 'jx step changelog --version v\$(cat ../../VERSION)'
+
+              // release the helm chart
+              sh 'jx step helm release'
+
+              // promote through all 'Auto' promotion Environments
+              sh 'jx promote -b --all-auto --timeout 1h --version \$(cat ../../VERSION)'
+            }
+          }
+        }
+      }
+    }
+    post {
+        always {
+            cleanWs()
+        }
+    }
+  }

OWNERS

@@ -0,0 +1,12 @@
+approvers:
+- gc-jenkins-x
+- mbeacom
+- owocki
+- thelostone-mc
+- SaptakS
+reviewers:
+- gc-jenkins-x
+- mbeacom
+- owocki
+- thelostone-mc
+- SaptakS

OWNERS_ALIASES

@@ -0,0 +1,18 @@
+aliases:
+- gc-jenkins-x
+- mbeacom
+- owocki
+- thelostone-mc
+- SaptakS
+best-approvers:
+- gc-jenkins-x
+- mbeacom
+- owocki
+- thelostone-mc
+- SaptakS
+best-reviewers:
+- gc-jenkins-x
+- mbeacom
+- owocki
+- thelostone-mc
+- SaptakS

app/app/settings.py

@@ -213,7 +213,7 @@
     if DEBUG and ENV == 'stage':
         ELASTIC_APM['DEBUG'] = True
 
-if ENV not in ['local', 'test']:
+if ENV not in ['local', 'test', 'staging', 'preview']:
     LOGGING = {
         'version': 1,
         'disable_existing_loggers': True,

app/assets/onepager/js/send.js

@@ -54,7 +54,9 @@ var wait_for_metadata = function(callback) {
 };
 
 $(document).ready(function() {
-  userSearch('.username-search', true);
+  if (typeof userSearch != 'undefined') {
+    userSearch('.username-search', true);
+  }
   set_metadata();
   // jquery bindings
   $('#advanced_toggle').click(function() {

app/assets/v2/css/dashboard.css

@@ -74,8 +74,6 @@ body {
 .title-row {
   display: flex;
   margin-top: 2em;
-  margin-right: 8px;
-  padding-bottom: 5px;
   float: right;
   border-bottom: 2px solid #3E24FB;
 }
@@ -200,15 +198,11 @@ body {
   }
 }
 
-@media (min-width: 992px) and (max-width: 1024px) {
+@media (max-width: 991.98px) {
 
   .bounty_row {
-    padding-left: 1rem;
-    padding-right: 2rem;
+    padding-left: 0;
   }
-}
-
-@media (max-width: 991.98px) {
 
   #onboard-dashboard .robot {
     display: none;
@@ -222,15 +216,6 @@ body {
     padding-right: 3em;
   }
 
-  #filter {
-    padding-left: 20px;
-  }
-
-  .bounty_row {
-    padding-left: 1em;
-    padding-right: 2em;
-  }
-
   .bounty-info {
     top: 10px;
     font-size: 10px;