[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Reset deploy branch to match production

2017-12-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398778 )

Change subject: Reset deploy branch to match production
..


Reset deploy branch to match production

Will need to redo commits between 798e2467 and this one next week

Change-Id: I5d830389ff5f2fa7ca76d01467adfd248dc784dd
---
M civicrm
M composer.json
M composer.lock
M sites/all/modules/queue2civicrm/DonationQueueConsumer.php
D sites/all/modules/queue2civicrm/DonationStats.php
M sites/all/modules/queue2civicrm/queue2civicrm.info
M sites/all/modules/queue2civicrm/queue2civicrm.module
D sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
M sites/all/modules/thank_you/make_thank_you.drush.inc
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M vendor
11 files changed, 44 insertions(+), 521 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/civicrm b/civicrm
index b2fab9d..a82f2e7 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b2fab9d9d24b1187e845ec601f4165683278243c
+Subproject commit a82f2e7ea633af7477a2c8859b97dbe13ddda5d7
diff --git a/composer.json b/composer.json
index 81456c6..72a398e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,7 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4",
-"jackgleeson/stats-collector": "dev-master"
+"wikimedia/composer-merge-plugin": "^1.4"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index 2ae68da..e06dee5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
 "This file is @generated automatically"
 ],
-"content-hash": "f5b1e547c9865d17802925641c804265",
+"content-hash": "32a4c6d1dba52d233ae8892c1908badf",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -353,65 +353,6 @@
 "time": "2017-06-30T14:54:48+00:00"
 },
 {
-"name": "dflydev/dot-access-data",
-"version": "v1.1.0",
-"source": {
-"type": "git",
-"url": 
"https://github.com/dflydev/dflydev-dot-access-data.git";,
-"reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a";,
-"reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.2"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0-dev"
-}
-},
-"autoload": {
-"psr-0": {
-"Dflydev\\DotAccessData": "src"
-}
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Dragonfly Development Inc.",
-"email": "i...@dflydev.com",
-"homepage": "http://dflydev.com";
-},
-{
-"name": "Beau Simensen",
-"email": "b...@dflydev.com",
-"homepage": "http://beausimensen.com";
-},
-{
-"name": "Carlos Frutos",
-"email": "car...@kiwing.it",
-"homepage": "https://github.com/cfrutos";
-}
-],
-"description": "Given a deep data structure, access data by dot 
notation.",
-"homepage": "https://github.com/dflydev/dflydev-dot-access-data";,
-"keywords": [
-"access",
-"data",
-"dot",
-"notation"
-],
-"time": "2017-01-20T21:14:22+00:00"
-},
-{
 "name": "geoip2/geoip2",
 "version": "v2.6.0",
 "source": {
@@ -686,46 +627,6 @@
 "password"
 ],
 "time": "2014-11-20T16:49:30+00:00"
-},
-{
-"name": "jackgleeson/stats-collector",
-"version": "dev-master",
-"source": {
-"type": "git",
-"url": "https://github.com/jackgleeson/stats-collector.git";,
-"reference": "1c792bbeac77d4781fbb788f341b601636696df5"
-},
-"dist": {
-"type": "zip

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Reset deploy branch to match production

2017-12-17 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398778 )

Change subject: Reset deploy branch to match production
..

Reset deploy branch to match production

Will need to redo commits between 798e2467 and this one next week

Change-Id: I5d830389ff5f2fa7ca76d01467adfd248dc784dd
---
M civicrm
M composer.json
M composer.lock
M sites/all/modules/queue2civicrm/DonationQueueConsumer.php
D sites/all/modules/queue2civicrm/DonationStats.php
M sites/all/modules/queue2civicrm/queue2civicrm.info
M sites/all/modules/queue2civicrm/queue2civicrm.module
D sites/all/modules/queue2civicrm/tests/phpunit/DonationStatsTest.php
M sites/all/modules/thank_you/make_thank_you.drush.inc
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M vendor
11 files changed, 44 insertions(+), 521 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/78/398778/1

diff --git a/civicrm b/civicrm
index b2fab9d..a82f2e7 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit b2fab9d9d24b1187e845ec601f4165683278243c
+Subproject commit a82f2e7ea633af7477a2c8859b97dbe13ddda5d7
diff --git a/composer.json b/composer.json
index 81456c6..72a398e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,7 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4",
-"jackgleeson/stats-collector": "dev-master"
+"wikimedia/composer-merge-plugin": "^1.4"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index 2ae68da..e06dee5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
 "This file is @generated automatically"
 ],
-"content-hash": "f5b1e547c9865d17802925641c804265",
+"content-hash": "32a4c6d1dba52d233ae8892c1908badf",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -353,65 +353,6 @@
 "time": "2017-06-30T14:54:48+00:00"
 },
 {
-"name": "dflydev/dot-access-data",
-"version": "v1.1.0",
-"source": {
-"type": "git",
-"url": 
"https://github.com/dflydev/dflydev-dot-access-data.git";,
-"reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a";,
-"reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.2"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0-dev"
-}
-},
-"autoload": {
-"psr-0": {
-"Dflydev\\DotAccessData": "src"
-}
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Dragonfly Development Inc.",
-"email": "i...@dflydev.com",
-"homepage": "http://dflydev.com";
-},
-{
-"name": "Beau Simensen",
-"email": "b...@dflydev.com",
-"homepage": "http://beausimensen.com";
-},
-{
-"name": "Carlos Frutos",
-"email": "car...@kiwing.it",
-"homepage": "https://github.com/cfrutos";
-}
-],
-"description": "Given a deep data structure, access data by dot 
notation.",
-"homepage": "https://github.com/dflydev/dflydev-dot-access-data";,
-"keywords": [
-"access",
-"data",
-"dot",
-"notation"
-],
-"time": "2017-01-20T21:14:22+00:00"
-},
-{
 "name": "geoip2/geoip2",
 "version": "v2.6.0",
 "source": {
@@ -686,46 +627,6 @@
 "password"
 ],
 "time": "2014-11-20T16:49:30+00:00"
-},
-{
-"name": "jackgleeson/stats-collector",
-"version": "dev-master",
-"source": {
-"type": "git",
-"url": "https://github.com/jackgleeson/stats-collector.git";,
-"reference": "1c792bbeac77d4781fbb788f341b601636696df5"
-},
-"dist": {
-"t