Draft template 1.7.0

lemberg · Nov 24, 2017 · 9567433 · 9567433
1 parent 1c8fdb5
commit 9567433
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,6 @@
-## Draft Template 1.x.x,
+## Draft Template 1.7.0, 2017-11-24
 
 - Sort dependencies in composer.json by default
-- Do not configure project locally by default
 - Add Draft settings file with common configuration for running Drupal in VM
 - Updated vendor libraries:
     * Draft Environment (lemberg/draft-environment: **^2.1.1**)
@@ -15,6 +14,7 @@
 - Do not merge core and Draft profile composer.json files anymore, because this is causing troubles with updating core
 - Add integration with Shippable CI
 - Add integration with Platform.sh
+- Explicitly depend on drupal/core: **^8.4.2** in order to avoid downgrading to 8.4.0-alpha1
 
 ## Draft Template 1.6.2, 2017-10-12
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/lemberg/draft-template.svg?branch=1.6.2)](https://travis-ci.org/lemberg/draft-template)
+[![Build Status](https://travis-ci.org/lemberg/draft-template.svg?branch=1.7.0)](https://travis-ci.org/lemberg/draft-template)
 
 This is a [Composer](https://getcomposer.org)-based installer for the [Draft](https://github.com/lemberg/draft) Drupal profile.
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,12 @@
 # UPGRADE
 
-## 1.6.x -> 1.7.x
+## 1.6.x -> 1.7.0
 
-1. Remove local settings file and run `composer install` one more time in order to get updated local development configuration.
+1. Add the following code at the bottom of `settings.local.php` file:
+
+    ```
+    // Draft settings. These come last so that they can override anything.
+    if (file_exists($app_root . '/' . $site_path . '/settings.draft.php')) {
+      include $app_root . '/' . $site_path . '/settings.draft.php';
+    }
+    ```