Merge pull request #382 from shikorism/develop

Release 20200603.2340
This commit is contained in:
shibafu 2020-06-03 23:42:28 +09:00 committed by GitHub
commit 23ebe46b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 19 deletions

View File

@ -26,6 +26,10 @@ commands:
- run: sudo apt install -y libpq-dev
- run: sudo docker-php-ext-install zip
- run: sudo docker-php-ext-install pdo_pgsql
- run:
command: |
curl -sSL "https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v12.16.3-linux-x64/bin/node
curl https://www.npmjs.com/install.sh | sudo bash
restore_composer:
steps:
- restore_cache:

14
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,14 @@
version: 2
updates:
# Maintain dependencies for npm
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
# Maintain dependencies for Composer
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "daily"

View File

@ -3,6 +3,8 @@
namespace App\Providers;
use App\MetadataResolver\MetadataResolver;
use GuzzleHttp\Client;
use GuzzleHttp\RequestOptions;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\ServiceProvider;
use Parsedown;
@ -36,5 +38,12 @@ class AppServiceProvider extends ServiceProvider
$this->app->singleton('parsedown', function () {
return Parsedown::instance();
});
$this->app->bind(Client::class, function () {
return new Client([
RequestOptions::HEADERS => [
'User-Agent' => 'TissueBot/1.0'
]
]);
});
}
}

28
composer.lock generated
View File

@ -704,16 +704,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.3",
"version": "6.5.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": ""
},
"require": {
@ -721,7 +721,7 @@
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.11"
"symfony/polyfill-intl-idn": "1.17.0"
},
"require-dev": {
"ext-curl": "*",
@ -767,7 +767,7 @@
"rest",
"web service"
],
"time": "2020-04-18T10:38:46+00:00"
"time": "2020-05-25T19:35:05+00:00"
},
{
"name": "guzzlehttp/promises",
@ -7031,20 +7031,20 @@
},
{
"name": "symfony/thanks",
"version": "v1.2.5",
"version": "v1.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/thanks.git",
"reference": "a8a5fbe3907a52cb7e2bb704d3b0231782b4193c"
"reference": "8bba4410e183ee72ddec1dbd73cf43f4a536485b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/thanks/zipball/a8a5fbe3907a52cb7e2bb704d3b0231782b4193c",
"reference": "a8a5fbe3907a52cb7e2bb704d3b0231782b4193c",
"url": "https://api.github.com/repos/symfony/thanks/zipball/8bba4410e183ee72ddec1dbd73cf43f4a536485b",
"reference": "8bba4410e183ee72ddec1dbd73cf43f4a536485b",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0",
"composer-plugin-api": "^1.0|^2.0",
"php": "^5.5.9|^7.0.0"
},
"type": "composer-plugin",
@ -7070,7 +7070,7 @@
}
],
"description": "Encourages sending ⭐ and 💵 to fellow PHP package maintainers (not limited to Symfony components)!",
"time": "2020-01-15T17:39:29+00:00"
"time": "2020-05-30T11:13:50+00:00"
},
{
"name": "theseer/tokenizer",
@ -7105,8 +7105,8 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "arne@blankerts.de"
"email": "arne@blankerts.de",
"role": "Developer"
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",

View File

@ -11,7 +11,7 @@
"stylelint": "stylelint resources/assets/sass/**/*"
},
"devDependencies": {
"@types/jquery": "^3.3.29",
"@types/jquery": "^3.3.38",
"bootstrap": "^4.3.1",
"cal-heatmap": "^3.3.10",
"chart.js": "^2.7.1",

View File

@ -759,10 +759,10 @@
"@types/minimatch" "*"
"@types/node" "*"
"@types/jquery@^3.3.29":
version "3.3.31"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz#27c706e4bf488474e1cb54a71d8303f37c93451b"
integrity sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==
"@types/jquery@^3.3.38":
version "3.3.38"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.38.tgz#6385f1e1b30bd2bff55ae8ee75ea42a999cc3608"
integrity sha512-nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA==
dependencies:
"@types/sizzle" "*"