Merge pull request #6636 from topcoder-platform/develop

Release v1.18.0
topcoder-platform · Sep 13, 2022 · 9ed1d9a · 9ed1d9a
2 parents 12b1a54 + 40a82f8
commit 9ed1d9a
Show file tree

Hide file tree

Showing 241 changed files with 12,423 additions and 17,502 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -363,14 +363,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - reskin-profile-settings
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - free
+                - footer-update
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global

diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,8 @@ jspm_packages
 # macOS system files
 *.DS_Store
 
+.env.sh
+
 # Misc files
 .build-info
 .vscode

diff --git a/__tests__/shared/__snapshots__/index.jsx.snap b/__tests__/shared/__snapshots__/index.jsx.snap
@@ -31,6 +31,7 @@ exports[`Snapshot match 1`] = `
     position="top-center"
     preventDuplicates={true}
     progressBar={false}
+    showCloseButton={true}
     transitionIn="fadeIn"
     transitionOut="fadeOut"
   />
@@ -69,6 +70,7 @@ exports[`Snapshot match 2`] = `
     position="top-center"
     preventDuplicates={true}
     progressBar={false}
+    showCloseButton={true}
     transitionIn="fadeIn"
     transitionOut="fadeOut"
   />

diff --git a/__tests__/shared/components/GUIKit/Datepicker/__snapshots__/index.jsx.snap b/__tests__/shared/components/GUIKit/Datepicker/__snapshots__/index.jsx.snap
@@ -102,7 +102,7 @@ exports[`Default render 1`] = `
     regular={false}
     renderCalendarInfo={null}
     renderDayContents={[Function]}
-    renderMonthElement={null}
+    renderMonthElement={[Function]}
     renderMonthText={null}
     reopenPickerOnClearDate={false}
     required={false}