Merge branch 'develop' into reskin-tco-badge

Author: kkartunov

.circleci/config.yml

@@ -349,21 +349,21 @@ workflows:
           filters:
             branches:
               only:
-                - reskin-profile
+                - free
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
           filters:
             branches:
               only:
-                - reskin-tco-badge
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global
           filters:
             branches:
               only:
-                - reskin-profile
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -378,8 +378,7 @@ workflows:
             branches:
               only:
                 - develop
-                - fix-security-headers
-                - tco23-BS-comps
+                - old-mm-fix
       # Production builds are exectuted
       # when PR is merged to the master
       # Don't change anything in this configuration
@@ -399,6 +398,7 @@ workflows:
             branches:
               ignore:
                 - develop
+                - submission_delete_button
 
   Smoke Testing:
     when: << pipeline.parameters.run_smoketesting >>

__tests__/shared/components/ProfilePage/Stats/SubTrackChallengeView/__snapshots__/index.jsx.snap

@@ -963,6 +963,11 @@ exports[`SubtrackChallengeView matches shallow snapshot 1`] = `
   }
   challengesHasMore={null}
   handle="thomaskranitsas"
+  isAlreadyLoadChallenge={
+    Object {
+      "current": false,
+    }
+  }
   loadMarathon={[Function]}
   loadSRM={[Function]}
   loadSubtrackChallenges={[Function]}