Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-07-13 06:12:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged with master main repo.

Browse Source
This commit is contained in:
Wim Rijnders
2013-01-19 09:07:50 +01:00
parent c41253d01b
commit 3507fb454a
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GitList/Controller/CommitController.php
View File

@@ -52,19 +52,13 @@ class CommitController implements ControllerProviderInterface
->value('file', '')
->bind('commits');
<<<<<<< HEAD
$route->post('{repo}/commits/search', function(Request $request, $repo) use ($app) {
$repotmp = $app['git']->getRepositoryCached($app['git.repos'], $repo);
$repository = $app['git']->getRepository($repotmp->getPath());
$query = $request->get('query');
$commits = $repository->searchCommitLog($request->get('query'));
=======
$route->post('{repo}/commits/{branch}/search', function(Request $request, $repo, $branch = '') use ($app) {
$repository = $app['git']->getRepository($app['git.repos'] . $repo);
$query = $request->get('query');
$commits = $repository->searchCommitLog($query);
$categorized = array();
>>>>>>> ab7ffc181b3d27a13e908a4e2b331a085b09f70b
foreach ($commits as $commit) {
$date = $commit->getDate();