Merge pull request #955 from newjersey/release

release
newjersey · Nov 11, 2021 · e14c276 · e14c276
2 parents e5366eb + b4cb98c
commit e14c276
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -311,36 +311,36 @@ workflows:
           filters:
             branches:
               only:
-                - /^release-.*/
+                - release
       - deploy-staging:
           name: staging-deploy
           filters:
             branches:
               only:
-                - /^release-.*/
+                - release
           requires:
             - staging-hold
       - production-hold:
           type: approval
           filters:
             branches:
               only:
-                - /^release-.*/
+                - release
           requires:
             - staging-deploy
       - prepare-release:
           filters:
             branches:
               only:
-                - /^release-.*/
+                - release
           requires:
             - production-hold
       - deploy-production:
           name: production-deploy
           filters:
             branches:
               only:
-                - /^release-.*/
+                - release
           requires:
             - prepare-release
 
@@ -350,23 +350,23 @@ workflows:
           filters:
             branches:
               ignore:
-                - /^release-.*/
+                - release
       - cypress-tests:
           name: Cypress Tests - Group 1
           suite: group1
           filters:
             branches:
               ignore:
                 - main
-                - /^release-.*/
+                - release
       - cypress-tests:
           name: Cypress Tests - Group 2
           suite: group2
           filters:
             branches:
               ignore:
                 - main
-                - /^release-.*/
+                - release
       - cypress-tests:
           name: Cypress Tests - Group 1
           enable-dashboard: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [1.1.0](https://github.com/newjersey/business.nj.gov/compare/v1.0.1...v1.1.0) (2021-11-11)
+
+
+### Bug Fixes
+
+* [[#760](https://github.com/newjersey/business.nj.gov/issues/760)] additional script for intercom identity ([c521524](https://github.com/newjersey/business.nj.gov/commit/c5215249da5eddd1ee9d496d2f9569a3be1d9ae8))
+* [[#760](https://github.com/newjersey/business.nj.gov/issues/760)] re-init after loading intercom identity ([81f2b63](https://github.com/newjersey/business.nj.gov/commit/81f2b63dfb0a2e90bb10a22a9dcae84e589c2b0e))
+* moved context-info into content folder ([d283ece](https://github.com/newjersey/business.nj.gov/commit/d283ece65465fa898e5ec144c3f12bc8a33686e7))
+
+
+### Features
+
+* [[#885](https://github.com/newjersey/business.nj.gov/issues/885)] implement links for the application logo ([da25712](https://github.com/newjersey/business.nj.gov/commit/da25712562285ba16b1532f3c883bc7d747c4ae4))
+
 ## [1.0.1](https://github.com/newjersey/business.nj.gov/compare/v1.0.0...v1.0.1) (2021-11-10)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@businessnjgovnavigator/root",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "This is the development repository for the work-in-progress business dashboard from the New Jersey Office of Innovation. For info on the existing [Business.NJ.gov](https://business.nj.gov) site, please see the [bottom of this document](https://github.com/newjersey/business.nj.gov#businessnjgov)",
   "main": "index.js",
   "private": true,