mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1865 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2019-12-02 17:35:07 -07:00 committed by GitHub
parent b10295a17b 4aa5454067
commit 723bc0c538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
composer.lock generated
View File

@ -1048,16 +1048,16 @@
},
{
"name": "ezyang/htmlpurifier",
"version": "v4.11.0",
"version": "v4.12.0",
"source": {
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
"reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7"
"reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
"reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
"reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
"shasum": ""
},
"require": {
@ -1091,7 +1091,7 @@
"keywords": [
"html"
],
"time": "2019-07-14T18:58:38+00:00"
"time": "2019-10-28T03:44:26+00:00"
},
{
"name": "fideloper/proxy",
@ -1415,16 +1415,16 @@
},
{
"name": "intervention/image",
"version": "2.5.0",
"version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "39eaef720d082ecc54c64bf54541c55f10db546d"
"reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/39eaef720d082ecc54c64bf54541c55f10db546d",
"reference": "39eaef720d082ecc54c64bf54541c55f10db546d",
"url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
"reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
"shasum": ""
},
"require": {
@ -1481,7 +1481,7 @@
"thumbnail",
"watermark"
],
"time": "2019-06-24T14:06:31+00:00"
"time": "2019-11-02T09:15:47+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@ -3939,16 +3939,16 @@
},
{
"name": "psr/log",
"version": "1.1.0",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@ -3957,7 +3957,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
@ -3982,7 +3982,7 @@
"psr",
"psr-3"
],
"time": "2018-11-20T15:27:04+00:00"
"time": "2019-11-01T11:05:21+00:00"
},
{
"name": "psr/simple-cache",
@ -4262,9 +4262,9 @@
"authors": [
{
"name": "Freek Van der Herten",
"role": "Developer",
"email": "freek@spatie.be",
"homepage": "https://spatie.be"
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "Dump databases",
@ -4315,9 +4315,9 @@
"authors": [
{
"name": "Freek Van der Herten",
"role": "Developer",
"email": "freek@spatie.be",
"homepage": "https://spatie.be"
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "Easily optimize images using PHP",
@ -5899,16 +5899,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v1.1.7",
"version": "v1.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
"reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
"reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
"reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
"shasum": ""
},
"require": {
@ -5953,7 +5953,7 @@
"interoperability",
"standards"
],
"time": "2019-09-17T11:12:18+00:00"
"time": "2019-10-14T12:27:06+00:00"
},
{
"name": "symfony/translation",
@ -6393,12 +6393,12 @@
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "4fb3665d24bdcdb403035e81ec1c36cca505f778"
"reference": "55cd3f5e892eee6f5aca414d465cc224b062bea6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/4fb3665d24bdcdb403035e81ec1c36cca505f778",
"reference": "4fb3665d24bdcdb403035e81ec1c36cca505f778",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/55cd3f5e892eee6f5aca414d465cc224b062bea6",
"reference": "55cd3f5e892eee6f5aca414d465cc224b062bea6",
"shasum": ""
},
"require": {
@ -6407,8 +6407,8 @@
"illuminate/support": "^5.5|^6",
"maximebf/debugbar": "~1.15.0",
"php": ">=7.0",
"symfony/debug": "^3|^4",
"symfony/finder": "^3|^4"
"symfony/debug": "^3|^4|^5",
"symfony/finder": "^3|^4|^5"
},
"require-dev": {
"laravel/framework": "5.5.x"
@ -6453,7 +6453,7 @@
"profiler",
"webprofiler"
],
"time": "2019-09-24T14:55:23+00:00"
"time": "2019-11-24T09:49:45+00:00"
},
{
"name": "composer/ca-bundle",
@ -7033,8 +7033,8 @@
"authors": [
{
"name": "Filipe Dobreira",
"role": "Developer",
"homepage": "https://github.com/filp"
"homepage": "https://github.com/filp",
"role": "Developer"
}
],
"description": "php error handling for cool kids",
@ -9784,16 +9784,16 @@
},
{
"name": "symfony/cache",
"version": "v4.3.5",
"version": "v4.3.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "40c62600ebad1ed2defbf7d35523d918a73ab330"
"reference": "2a7bcc592adcaab9efc165bbced5a91fe905fad4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/40c62600ebad1ed2defbf7d35523d918a73ab330",
"reference": "40c62600ebad1ed2defbf7d35523d918a73ab330",
"url": "https://api.github.com/repos/symfony/cache/zipball/2a7bcc592adcaab9efc165bbced5a91fe905fad4",
"reference": "2a7bcc592adcaab9efc165bbced5a91fe905fad4",
"shasum": ""
},
"require": {
@ -9858,7 +9858,7 @@
"caching",
"psr6"
],
"time": "2019-10-04T10:57:53+00:00"
"time": "2019-12-01T10:50:31+00:00"
},
{
"name": "symfony/cache-contracts",
@ -10339,28 +10339,28 @@
},
{
"name": "symfony/var-exporter",
"version": "v4.3.5",
"version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
"reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2"
"reference": "e566070effe60b8d16b99e958cdbd92aa2e470cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/d5b4e2d334c1d80e42876c7d489896cfd37562f2",
"reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/e566070effe60b8d16b99e958cdbd92aa2e470cb",
"reference": "e566070effe60b8d16b99e958cdbd92aa2e470cb",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"require-dev": {
"symfony/var-dumper": "^4.1.1"
"symfony/var-dumper": "^4.1.1|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "4.4-dev"
}
},
"autoload": {
@ -10395,7 +10395,7 @@
"instantiate",
"serialize"
],
"time": "2019-08-22T07:33:08+00:00"
"time": "2019-12-01T08:39:58+00:00"
},
{
"name": "symfony/yaml",