Merge branch 'release/2.2.7' into craft-webpack

nystudio107 · Mar 27, 2020 · bdc84d5 · bdc84d5
2 parents cde5965 + 4c2e254
commit bdc84d5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.2.7 - 2020.03.27
+### Changed
+* Removed `SITE_NAME` from the `.env` vars; it's not a secret, and it doesn't change per environment
+
 ## 2.2.6 - 2020.03.27
 ### Changed
 * Remove Craft & Plugin Licenses from .env — not necessary except for public repos

diff --git a/cms/config/project.yaml b/cms/config/project.yaml
@@ -1,7 +1,7 @@
 dateModified: 1566064218
 email:
   fromEmail: [email protected]
-  fromName: $SITE_NAME
+  fromName: admin
   transportType: craft\mail\transportadapters\Sendmail
 fieldGroups:
   d08a0d16-0e00-49e6-9cd4-465fa2d65d7d:
@@ -194,10 +194,10 @@ sections:
         sortOrder: 1
 siteGroups:
   f89601e9-4ba9-4a48-9e99-350aa9914912:
-    name: $SITE_NAME
+    name: Default
 sites:
   5da841b1-ca0d-46ff-8bb1-04d6c889ac54:
-    name: $SITE_NAME
+    name: Default
     handle: default
     language: en-US
     hasUrls: true
@@ -206,8 +206,8 @@ sites:
     primary: true
     siteGroup: f89601e9-4ba9-4a48-9e99-350aa9914912
 system:
-  edition: solo
-  name: $SITE_NAME
+  edition: pro
+  name: Craft
   live: true
   schemaVersion: 3.4.10
   timeZone: America/New_York

diff --git a/cms/example.env b/cms/example.env
@@ -8,7 +8,6 @@ ENVIRONMENT=dev
 IS_SYSTEM_LIVE=1
 RUN_QUEUE_AUTOMATICALLY=1
 SECURITY_KEY=EOdiVBONceb8zFGJP7InMui2pMkvNACz
-SITE_NAME=
 
 # Craft database settings
 DB_DRIVER=mysql

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "keywords": [
     "craft",
     "cms",