From e4ec45d34a50962dea475dbde3c5aa3f93c629a6 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Thu, 21 Feb 2019 02:35:20 +0200
Subject: [PATCH] Issue #3032659: Varbase 8.6.5: Update [CHANGELOG.md,
 UPDATE.md, drupal-org.make] files and filter the code for Drupal 8 Coding
 Standard

---
 CHANGELOG.md    | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |  4 +--
 composer.json   | 30 ++++++++++----------
 drupal-org.make | 32 +++++++++++----------
 4 files changed, 108 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 795d7282..776b075c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,76 @@
+# 8.6.5
+
+### Highlighted important changes since Varbase 8.6.4:
+* Cleaned up number of modules with hash commits so that
+ [vardot/varbase-project](https://github.com/Vardot/varbase-project)
+ template and the
+ [composer.json](https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json)
+ looks clean.
+* Issue [#3033630](https://www.drupal.org/node/3033630):
+                  Renamed Google+ to Google in installer.
+* Issue [#3034471](https://www.drupal.org/node/3034471):
+                 Updated [Google Analytics Reports] module
+                 from 3.x-dev 2b6bb8e to (~3.0) as 8.x-3.0-beta2 went out.
+* Issue [#3034567](https://www.drupal.org/node/3034567):
+                 Changed [Social Auth Google] Google+ logo to Google accounts
+                 as Google shutdown Google+
+* Issue [#3032661](https://www.drupal.org/node/3032661):
+                 Changed [Varbase Internationalization] not to use the
+                 [Localization client] module by disabling it for old sites
+                 and not to install it in new Varbase installations.
+* Issue [#3033768](https://www.drupal.org/node/3033768):
+                 Fixed W3C standards for element div not allowed as child
+                 of element h2.
+
+### Added since Varbase 8.6.4:
+* Issue [#3034567](https://www.drupal.org/node/3034567):
+                 Added the 3034353-2.patch for [Social Auth Google] to change
+                 the Google+ logo to Google accounts as Google shutdown Google+
+
+### Changed since Varbase 8.6.4:
+* Issue [#3033630](https://www.drupal.org/node/3033630)
+                 by [Mohammed J. Razem](https://www.drupal.org/u/mohammed-j-razem):
+                 Renamed Google+ to Google in installer.
+* Issue [#3032661](https://www.drupal.org/node/3032661):
+                 Changed [Varbase Internationalization] not to use the
+                 [Localization client] module by disabling it for old sites
+                 and not to install it in new Varbase installations.
+* Issue [#3032678](https://www.drupal.org/node/3032678):
+                 Changed [Varbase Security] not to install the [Security Review]
+                 module in new Varbase installations and require a * wild
+                 card version.
+* Issue [#3032690](https://www.drupal.org/node/3032690):
+                 Changed [Varbase Admin] require [Mail Editor] module with a
+                 * wild card version.
+* Issue [#3034396](https://www.drupal.org/node/3034396):
+                 Removed all patches for [Entity Clone] as they
+                 all are already applied in 8.x-1.0-beta2.
+
+### Updates since Varbase 8.6.4:
+* Issue [#3034471](https://www.drupal.org/node/3034471):
+                 Updated [Google Analytics Reports] module from
+                 3.x-dev 2b6bb8e to (~3.0) as 8.x-3.0-beta2 went out.
+* Issue [#3034513](https://www.drupal.org/node/3034513):
+                 Updated [Paragraphs] module from 8.1.5 to 8.1.6
+* Issue [#3034502](https://www.drupal.org/node/3034502):
+                 Updated [Paragraphs Previewer] module from 8.1.2 to 8.1.4
+* Issue [#3032699](https://www.drupal.org/node/3032699):
+                 Updated [Tour Builder] module
+                 from 1.x-dev d70e898 to (~1.0) as 8.x-1.0-alpha1 went out
+* Issue [#3032929](https://www.drupal.org/node/3032929):
+                 Updated [Node Edit Protection] module
+                 from 1.x-dev 902339c to (~1.0) as 8.x-1.0-alpha1 went out.
+
+### Fixes since Varbase 8.x-6.4:
+* Issue [#3033768](https://www.drupal.org/node/3033768)
+                 by [Mohammad Fayoumi](https://www.drupal.org/u/mohammad-fayoumi):
+                 Fixed W3C standards for element div not allowed as child of element h2.
+* Issue [#3033845](https://www.drupal.org/node/3033845)
+                 by [m.alhawwari](https://www.drupal.org/u/malhawwari):
+                 Fixed overflow of table input field on smaller screens.
+
+--------------------------------------------------------------------------------
+
 # 8.6.4
 
 ### Highlighted important changes since Varbase 8.6.3:
@@ -88,6 +161,7 @@
                    Fixed issue with single slide height on full content and
                    single slick slide and the center of video players
 
+--------------------------------------------------------------------------------
 
 # 8.6.3
 
diff --git a/README.md b/README.md
index 2e12a923..f730708d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/Vardot/varbase.svg?branch=8.x-6.4)](https://travis-ci.org/Vardot/varbase/builds/485040548) Varbase 8.6.4
+[![Build Status](https://travis-ci.org/Vardot/varbase.svg?branch=8.x-6.5)](https://travis-ci.org/Vardot/varbase) Varbase 8.6.5
 
 [![](https://www.drupal.org/files/styles/grid-3/public/project-images/Medium-Logo%20Color%20with%20padding.png)](https://www.drupal.org/project/varbase)
 
@@ -28,7 +28,7 @@ instructions.
 
 To install the most recent stable release of Varbase 8.6.x run this command:
 ```
-composer create-project Vardot/varbase-project:^8.6.4 PROJECT_DIR_NAME --no-dev --no-interaction
+composer create-project Vardot/varbase-project:^8.6.5 PROJECT_DIR_NAME --no-dev --no-interaction
 ```
 
 To install the dev version of Varbase 8.6.x run this command:
diff --git a/composer.json b/composer.json
index acef20dc..ba864f78 100644
--- a/composer.json
+++ b/composer.json
@@ -32,21 +32,21 @@
     "cweagans/composer-patches": "~1.0",
     "drupal-composer/drupal-scaffold": "~2.0",
     "drupal/drupal-library-installer-plugin": "^0.3",
-    "drupal/varbase_core": "6.x-dev",
-    "drupal/varbase_media": "6.x-dev",
-    "drupal/varbase_bootstrap_paragraphs": "6.x-dev",
-    "drupal/varbase_editor": "6.x-dev",
-    "drupal/varbase_landing": "6.x-dev",
-    "drupal/varbase_search": "6.x-dev",
-    "drupal/varbase_seo": "6.x-dev",
-    "drupal/varbase_heroslider_media": "6.x-dev",
-    "drupal/varbase_carousels": "6.x-dev",
-    "drupal/varbase_total_control": "6.x-dev",
-    "drupal/varbase_auth" : "6.x-dev",
-    "drupal/varbase_blog" : "6.x-dev",
-    "drupal/varbase_styleguide": "6.x-dev",
-    "drupal/vartheme": "6.x-dev",
-    "drupal/vartheme_admin": "6.x-dev",
+    "drupal/varbase_core": "~6.0",
+    "drupal/varbase_media": "~6.0",
+    "drupal/varbase_bootstrap_paragraphs": "~6.0",
+    "drupal/varbase_editor": "~6.0",
+    "drupal/varbase_landing": "~6.0",
+    "drupal/varbase_search": "~6.0",
+    "drupal/varbase_seo": "~6.0",
+    "drupal/varbase_heroslider_media": "~6.0",
+    "drupal/varbase_carousels": "~6.0",
+    "drupal/varbase_total_control": "~6.0",
+    "drupal/varbase_auth" : "~6.0",
+    "drupal/varbase_blog" : "~6.0",
+    "drupal/varbase_styleguide": "~6.0",
+    "drupal/vartheme": "~6.0",
+    "drupal/vartheme_admin": "~6.0",
     "drupal/image_resize_filter": "1.x-dev#c3f4b23b02005859092aaff746b9f21b794adc58",
     "drupal/login_destination": "1.x-dev#54be8b89fdc073ca40af6b9b2eeb050e0aeb7908"
   },
diff --git a/drupal-org.make b/drupal-org.make
index a5a6acc4..31aadcc7 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -308,6 +308,8 @@ projects[social_auth][version] = 2.0-beta4
 
 projects[social_auth_google][type] = module
 projects[social_auth_google][version] = 2.0-beta3
+;; Issue #3034353: Change the Google+ logo to Google accounts as Google shutdown Google+
+projects[social_auth_google][patch][] = https://www.drupal.org/files/issues/2019-02-20/3034353-2.patch
 
 projects[social_auth_facebook][type] = module
 projects[social_auth_facebook][version] = 2.0-beta3
@@ -456,53 +458,53 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2
 ;;;;;;;;;;;;;;;;;;;;;
 
 projects[varbase_core][type] = module
-projects[varbase_core][version] = 6.x-dev
+projects[varbase_core][version] = 6.7
 
 projects[varbase_media][type] = module
-projects[varbase_media][version] = 6.x-dev
+projects[varbase_media][version] = 6.4
 
 projects[varbase_bootstrap_paragraphs][type] = module
-projects[varbase_bootstrap_paragraphs][version] = 6.x-dev
+projects[varbase_bootstrap_paragraphs][version] = 6.4
 
 projects[varbase_editor][type] = module
-projects[varbase_editor][version] = 6.x-dev
+projects[varbase_editor][version] = 6.2
 
 projects[varbase_landing][type] = module
-projects[varbase_landing][version] = 6.x-dev
+projects[varbase_landing][version] = 6.1
 
 projects[varbase_search][type] = module
-projects[varbase_search][version] = 6.x-dev
+projects[varbase_search][version] = 6.1
 
 projects[varbase_seo][type] = module
-projects[varbase_seo][version] = 6.x-dev
+projects[varbase_seo][version] = 6.3
 
 projects[varbase_heroslider_media][type] = module
-projects[varbase_heroslider_media][version] = 6.x-dev
+projects[varbase_heroslider_media][version] = 6.3
 
 projects[varbase_carousels][type] = module
-projects[varbase_carousels][version] = 6.x-dev
+projects[varbase_carousels][version] = 6.1
 
 projects[varbase_total_control][type] = module
-projects[varbase_total_control][version] = 6.x-dev
+projects[varbase_total_control][version] = 6.4
 
 projects[varbase_auth][type] = module
-projects[varbase_auth][version] = 6.x-dev
+projects[varbase_auth][version] = 6.3
 
 projects[varbase_blog][type] = module
-projects[varbase_blog][version] = 6.x-dev
+projects[varbase_blog][version] = 6.1
 
 projects[varbase_styleguide][type] = module
-projects[varbase_styleguide][version] = 6.x-dev
+projects[varbase_styleguide][version] = 6.1
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Varbase public contributed themes.
 ;;;;;;;;;;;;;;;;;;;;;
 
 projects[vartheme][type] = theme
-projects[vartheme][version] = 6.x-dev
+projects[vartheme][version] = 6.4
 
 projects[vartheme_admin][type] = theme
-projects[vartheme_admin][version] = 6.x-dev
+projects[vartheme_admin][version] = 6.5
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Libraries
-- 
GitLab