DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342004 )
Change subject: Merge remote-tracking branch 'origin/master' into es5
......................................................................
Merge remote-tracking branch 'origin/master' into es5
Change-Id: I148868fec8a437122c29fc164ad3360175a75f44
---
M .gitreview
M composer.lock
M composer/installed.json
3 files changed, 61 insertions(+), 215 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/04/342004/1
diff --git a/.gitreview b/.gitreview
index f2d5d18..8ebfd16 100644
--- a/.gitreview
+++ b/.gitreview
@@ -4,4 +4,4 @@
project=mediawiki/vendor.git
track=1
defaultrebase=0
-defaultbranch=es5
+defaultbranch=master
diff --git a/composer.lock b/composer.lock
index 7243f15..8b8ec46 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,11 +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"
],
-<<<<<<< HEAD (9dcede Merge remote-tracking branch 'origin/master' into es5)
- "content-hash": "1255177b764145c4f6bb83813f0fac08",
-=======
- "content-hash": "bc869c0e0c968acf6df021fb92b4f1db",
->>>>>>> BRANCH (a433a7 Update OOjs UI to v0.19.5)
+ "content-hash": "1e083d31708c44a25e06d42bf41ad469",
"packages": [
{
"name": "composer/semver",
diff --git a/composer/installed.json b/composer/installed.json
index e94e35d..38b5ca2 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1032,6 +1032,65 @@
"homepage": "https://www.mediawiki.org/wiki/HtmlFormatter";
},
{
+ "name": "ruflin/elastica",
+ "version": "5.1.0",
+ "version_normalized": "5.1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ruflin/Elastica.git";,
+ "reference": "tags/5.1.0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
+ "reference": "tags/5.1.0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6.0",
+ "psr/log": "~1.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~3.0",
+ "guzzlehttp/guzzle": "~6.0"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow using IAM authentication with Amazon
ElasticSearch Service",
+ "egeloen/http-adapter": "Allow using httpadapter transport",
+ "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport",
+ "monolog/monolog": "Logging request"
+ },
+ "time": "2017-02-15T11:19:35+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Elastica\\": "lib/Elastica/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Ruflin",
+ "homepage": "http://ruflin.com/";
+ }
+ ],
+ "description": "Elasticsearch Client",
+ "homepage": "http://elastica.io/";,
+ "keywords": [
+ "client",
+ "search"
+ ]
+ },
+ {
"name": "wikimedia/ip-set",
"version": "1.1.0",
"version_normalized": "1.1.0.0",
@@ -1845,11 +1904,6 @@
]
},
{
-<<<<<<< HEAD (9dcede Merge remote-tracking branch 'origin/master' into es5)
- "name": "oojs/oojs-ui",
- "version": "v0.19.4",
- "version_normalized": "0.19.4.0",
-=======
"name": "symfony/process",
"version": "v3.0.9",
"version_normalized": "3.0.9.0",
@@ -1947,7 +2001,6 @@
"name": "wikimedia/timestamp",
"version": "v1.0.0",
"version_normalized": "1.0.0.0",
->>>>>>> BRANCH (a433a7 Update OOjs UI to v0.19.5)
"source": {
"type": "git",
"url": "https://github.com/wikimedia/Timestamp.git";,
@@ -2139,208 +2192,5 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
-<<<<<<< HEAD (9dcede Merge remote-tracking branch 'origin/master' into es5)
- },
- {
- "name": "symfony/process",
- "version": "v3.0.9",
- "version_normalized": "3.0.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/process.git";,
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505";,
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "time": "2016-07-28T11:13:34+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Process\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fab...@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors";
- }
- ],
- "description": "Symfony Process Component",
- "homepage": "https://symfony.com";
- },
- {
- "name": "ruflin/elastica",
- "version": "5.1.0",
- "version_normalized": "5.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ruflin/Elastica.git";,
- "reference": "tags/5.1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
- "reference": "tags/5.1.0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.6.0",
- "psr/log": "~1.0"
- },
- "require-dev": {
- "aws/aws-sdk-php": "~3.0",
- "guzzlehttp/guzzle": "~6.0"
- },
- "suggest": {
- "aws/aws-sdk-php": "Allow using IAM authentication with Amazon
ElasticSearch Service",
- "egeloen/http-adapter": "Allow using httpadapter transport",
- "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport",
- "monolog/monolog": "Logging request"
- },
- "time": "2017-02-15T11:19:35+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.1.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Elastica\\": "lib/Elastica/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Ruflin",
- "homepage": "http://ruflin.com/";
- }
- ],
- "description": "Elasticsearch Client",
- "homepage": "http://elastica.io/";,
- "keywords": [
- "client",
- "search"
- ]
- },
- {
- "name": "wikimedia/remex-html",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/mediawiki-libs-RemexHtml.git";,
- "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32";,
- "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "wikimedia/utfnormal": "1.*"
- },
- "require-dev": {
- "mediawiki/mediawiki-codesniffer": "0.7.2",
- "phpunit/phpunit": "4.*"
- },
- "time": "2017-02-24T05:24:34+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "RemexHtml\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Tim Starling",
- "email": "tstarl...@wikimedia.org"
- }
- ],
- "description": "Fast HTML 5 parser"
- },
- {
- "name": "wikimedia/timestamp",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/Timestamp.git";,
- "reference": "880660a2fbc6e577d381225812c255008d58e0cc"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/Timestamp/zipball/880660a2fbc6e577d381225812c255008d58e0cc";,
- "reference": "880660a2fbc6e577d381225812c255008d58e0cc",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2",
- "phpunit/phpunit": "4.8.24"
- },
- "time": "2016-09-30T10:00:56+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "src/"
- ],
- "files": [
- "src/defines.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Tyler Romeo",
- "email": "tylerro...@gmail.com"
- }
- ],
- "description": "Creation, parsing, and conversion of timestamps",
- "homepage": "https://www.mediawiki.org/wiki/Timestamp";
-=======
->>>>>>> BRANCH (a433a7 Update OOjs UI to v0.19.5)
}
]
--
To view, visit https://gerrit.wikimedia.org/r/342004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I148868fec8a437122c29fc164ad3360175a75f44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
