mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Update dependencies.

Browse Source
This commit is contained in:
James Brooks 2015-06-03 08:42:03 +01:00
parent fad393be1d
commit 1e27882b90
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/HomeController.php
View File

@ -91,7 +91,7 @@ class HomeController extends AbstractController
$scheduledMaintenance = Incident::scheduled()->orderBy('scheduled_at')->get(); $scheduledMaintenance = Incident::scheduled()->orderBy('scheduled_at')->get();
// Component & Component Group lists. // Component & Component Group lists.
$usedComponentGroups = Component::where('group_id', '>', 0)->groupBy('group_id')->lists('group_id'); $usedComponentGroups = Component::where('group_id', '>', 0)->groupBy('group_id')->lists('group_id')->all();
$componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get(); $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
$ungroupedComponents = Component::where('group_id', 0)->orderBy('order')->orderBy('created_at')->get(); $ungroupedComponents = Component::where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();

38
composer.lock generated
View File

@ -1567,12 +1567,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "cb1faa5495c2f80ad38944c64bc8bfb67d4c74a7" "reference": "3c1d7672ec207fbd51f3757182a552f4ddd3836e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/cb1faa5495c2f80ad38944c64bc8bfb67d4c74a7", "url": "https://api.github.com/repos/laravel/framework/zipball/3c1d7672ec207fbd51f3757182a552f4ddd3836e",
"reference": "cb1faa5495c2f80ad38944c64bc8bfb67d4c74a7", "reference": "3c1d7672ec207fbd51f3757182a552f4ddd3836e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1689,7 +1689,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2015-06-01 17:05:16" "time": "2015-06-02 21:56:35"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
@ -3327,16 +3327,16 @@
}, },
{ {
"name": "watson/validating", "name": "watson/validating",
"version": "1.0.2", "version": "1.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dwightwatson/validating.git", "url": "https://github.com/dwightwatson/validating.git",
"reference": "47320813a45cc35384e72364484d54fe44dcd3fb" "reference": "c32912f760b456c043657951683ed6c468ab83e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dwightwatson/validating/zipball/47320813a45cc35384e72364484d54fe44dcd3fb", "url": "https://api.github.com/repos/dwightwatson/validating/zipball/c32912f760b456c043657951683ed6c468ab83e7",
"reference": "47320813a45cc35384e72364484d54fe44dcd3fb", "reference": "c32912f760b456c043657951683ed6c468ab83e7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3378,7 +3378,7 @@
"laravel", "laravel",
"validation" "validation"
], ],
"time": "2015-05-23 00:03:54" "time": "2015-06-03 02:25:38"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -3599,16 +3599,16 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "2.1.2", "version": "2.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f" "reference": "28a6b34e91d789b2608072ab3c82eaae7cdb973c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/28a6b34e91d789b2608072ab3c82eaae7cdb973c",
"reference": "6b7d2094ca2a685a2cad846cb7cd7a30e8b9470f", "reference": "28a6b34e91d789b2608072ab3c82eaae7cdb973c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3657,7 +3657,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2015-06-01 07:35:26" "time": "2015-06-03 07:01:01"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@ -3845,16 +3845,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.6.9", "version": "4.6.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "816d12536a7a032adc3b68737f82cfbbf98b79c1" "reference": "7b5fe98b28302a8b25693b2298bca74463336975"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/816d12536a7a032adc3b68737f82cfbbf98b79c1", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7b5fe98b28302a8b25693b2298bca74463336975",
"reference": "816d12536a7a032adc3b68737f82cfbbf98b79c1", "reference": "7b5fe98b28302a8b25693b2298bca74463336975",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3913,7 +3913,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2015-05-29 06:00:03" "time": "2015-06-03 05:03:30"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",