summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Arg.id via method pointerPawel Chojnacki2018-03-061-1/+1
| * | | | | | | one space too farPawel Chojnacki2018-03-051-1/+0
| * | | | | | | Check if prometheus_adapter is properly calledPawel Chojnacki2018-03-051-1/+2
| * | | | | | | Implemente Prometheus:AdapterServicePawel Chojnacki2018-03-054-30/+44
| * | | | | | | add missing newlinePawel Chojnacki2018-03-011-1/+1
| * | | | | | | Implement PrometheusDeploymentLocator + fix metrics controllerPawel Chojnacki2018-03-013-25/+30
| * | | | | | | use deployment_platform DI in environment and revert changes to k8s cert veri...Pawel Chojnacki2018-02-262-3/+7
| * | | | | | | Fix failing test, when deployment platform is not bound to a cluster.Pawel Chojnacki2018-02-261-2/+4
| * | | | | | | drop the ! from synchronize_service_state! + remove unused scopePawel Chojnacki2018-02-242-4/+2
| * | | | | | | Use deployment platform to find cluster with prometheus applicationPawel Chojnacki2018-02-241-5/+3
| * | | | | | | Squashed commit of the following:Pawel Chojnacki2018-02-2411-108/+101
* | | | | | | | Merge branch 'zj-lazy-parents' into 'master'Douwe Maan2018-03-061-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Lazy fetch parent commits for a commitZeger-Jan van de Weg2018-03-061-2/+5
* | | | | | | | | Merge branch 'sh-dashboard-sort-fix' into 'master'Douwe Maan2018-03-061-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix project dashboard showing the wrong timestampssh-dashboard-sort-fixStan Hu2018-03-051-2/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-066-48/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu...Shinya Maeda2018-03-065-16/+14
| * | | | | | | | | Change the place of definition of object_storage:archive_legacy_traceShinya Maeda2018-03-061-2/+2
| * | | | | | | | | Add object_storage queue to sidekiq_queues.ym. and correct queue name in all_...Shinya Maeda2018-03-061-1/+1
| * | | | | | | | | Add object_storage queueShinya Maeda2018-03-061-0/+2
| * | | | | | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactServiceShinya Maeda2018-03-063-39/+11
| * | | | | | | | | Proper fix for artifacts trace migration which is fully safeKamil Trzciński2018-03-061-1/+3
* | | | | | | | | | Merge branch '43924-breadcrumbs-on-project-tags' into 'master'Phil Hughes2018-03-061-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove extra breadcrumb on tagsTakuya Noguchi2018-03-061-1/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-062-2/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | review: rename import_export to import_export_sharedTravis Miller2018-03-052-5/+5
| * | | | | | | | | review: instantiate shared import/export object in project methodTravis Miller2018-02-282-3/+7
| * | | | | | | | | Add project export API implementationTravis Miller2018-02-282-4/+3
| * | | | | | | | | Add project export API entitiesTravis Miller2018-02-281-0/+15
* | | | | | | | | | Fix Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-062-20/+12
* | | | | | | | | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into...Rémy Coutable2018-03-065-34/+92
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-065-34/+92
* | | | | | | | | | Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-062-14/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert unnecessary code running_or_pending_build_count removalShinya Maeda2018-03-062-0/+7
| * | | | | | | | | | Introduce FailedToExtractError. Fix spec. Add DNS test mock.Shinya Maeda2018-03-061-7/+8
| * | | | | | | | | | Add empty line after custom error difinitionShinya Maeda2018-03-061-0/+1
| * | | | | | | | | | Drop running_or_pending_build_countShinya Maeda2018-03-062-7/+0
| * | | | | | | | | | Fix commentShinya Maeda2018-03-061-1/+1
| * | | | | | | | | | Rework to minimize changesShinya Maeda2018-03-062-9/+16
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage"Shah El-Rahman2018-03-061-5/+5
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'remove-default-scope-from-todos' into 'master'Yorick Peterse2018-03-062-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove default scope from todosremove-default-scope-from-todosSean McGivern2018-03-052-9/+9
* | | | | | | | | | Merge branch '38587-pipelines-empty-state' into 'master'Phil Hughes2018-03-069-224/+305
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changes after review38587-pipelines-empty-stateFilipa Lacerda2018-03-055-14/+8
| * | | | | | | | | | [ci skip] Merge branch 'master' into 38587-pipelines-empty-stateFilipa Lacerda2018-03-0546-52/+825
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix broken empty tab stateFilipa Lacerda2018-03-051-1/+1
| * | | | | | | | | | | Manage empty states in Pipelines pageFilipa Lacerda2018-03-0510-222/+309
* | | | | | | | | | | | Resolve "Enable privileged mode for Runner installed on Kubernetes"Mayra Cabrera2018-03-061-2/+3
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-057-30/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CI/CD-only projects FEEric Eastwood2018-03-057-28/+73