summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-087-48/+105
* Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-081-1/+1
* Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+1
* Revert "Cleanup after adding MR diff's commit_count"James Lopez2018-03-071-0/+4
* Merge branch 'consistent-deployment_platform' into 'master'Grzegorz Bizon2018-03-072-2/+3
* Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-qu...Kamil Trzciński2018-03-062-1/+3
|\
| * Change queue namespace of UpdateHeadPipelineForMergeRequestWorkerShinya Maeda2018-03-071-0/+2
| * Move update_head_pipeline_for_merge_request queue to pipeline_processing name...Shinya Maeda2018-03-071-1/+1
* | Merge branch 'ce-3727-fe-labels-for-epics' into 'master'Filipa Lacerda2018-03-063-5/+7
|\ \
| * | Backport description composition from EEce-3727-fe-labels-for-epicsKushal Pandya2018-03-061-2/+4
| * | Add `js-*` class to refer in JSKushal Pandya2018-03-062-3/+3
* | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-0610-63/+173
|\ \ \
| * | | move misplaced entry pointcluster-monitoring-changes-ce-backportMike Greiling2018-03-061-0/+0
| * | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-062-5/+9
| * | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| * | | remove prometheus panel styling on cluster monitoring pageMike Greiling2018-03-062-1/+21
| * | | lighten axis tick textMike Greiling2018-03-061-1/+2
| * | | add ability to override graph size measurementsMike Greiling2018-03-062-1/+12
| * | | fix spacing around axis label text in small breakpointsMike Greiling2018-03-061-2/+3
| * | | hide legend without hiding the axis labelsMike Greiling2018-03-062-35/+42
| * | | add option to hide the graph legendMike Greiling2018-03-062-1/+15
| * | | use proper dependency injection for monitoring dashboard componentMike Greiling2018-03-063-23/+69
| * | | make deployments endpoint optionalMike Greiling2018-03-061-0/+3
| * | | add prometheus cluster health monitoring empty stateMike Greiling2018-03-061-1/+4
* | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0635-83/+435
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-06203-4223/+1567
| |\ \ \
| * | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-061-1/+1
| * | | | Address review commentsFelipe Artur2018-03-053-15/+12
| * | | | Bring one group board to CEFelipe Artur2018-03-0335-84/+440
* | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-0611-110/+124
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-06474-6021/+4918
| |\ \ \ \
| * | | | | 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
View Lorry Controller Status