summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-067-2/+13
* Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-qu...Kamil Trzciński2018-03-065-2/+83
|\
| * 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-074-2/+81
* | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-062-5/+8
|\ \
| * | Fix false positive spec of using digest instead of hexdigestShinya Maeda2018-03-071-4/+4
| * | Set sha256 checksum when archiving tracesShinya Maeda2018-03-072-1/+4
| |/
* | 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-0612-108/+225
|\ \ \
| * | | prefer checking explicitly for nullMike Greiling2018-03-061-2/+2
| * | | replace fixture with simple mount pointMike Greiling2018-03-062-39/+6
| * | | add new tests for metrics dashboard changesMike Greiling2018-03-061-9/+34
| * | | 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-063-7/+11
| * | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| * | | fix karma testsMike Greiling2018-03-061-1/+16
| * | | 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-0667-469/+1730
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-06543-11966/+29559
| |\ \ \ \
| * | | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-063-2/+5
| * | | | | Address review commentsFelipe Artur2018-03-059-47/+31
| * | | | | Bring one group board to CEFelipe Artur2018-03-0366-469/+1744
* | | | | | Merge branch 'prepend-grape-api-ce' into 'master'Rémy Coutable2018-03-061-21/+40
|\ \ \ \ \ \
| * | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
* | | | | | | Merge branch 'rc/speedup-rake-jobs' into 'master'Robert Speicher2018-03-061-131/+113
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | New .dedicated-no-docs-pull-cache-job and .no-db-job definitionsRémy Coutable2018-03-061-136/+99
| * | | | | | Add date calls in .gitlab-ci.yml to see how long each step takeRémy Coutable2018-03-061-0/+19
* | | | | | | Merge branch 'docs-devguide-cherry-pick-ce-to-ee' into 'master'Achilleas Pipinellis2018-03-062-2/+140
|\ \ \ \ \ \ \
| * | | | | | | Docs guidelines: cherry-picking commits from CE to EEMarcia Ramos2018-03-062-2/+140
|/ / / / / / /
* | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-0630-370/+403
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-061193-16194/+18833
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | 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-053-32/+21
| * | | | | | Implemente Prometheus:AdapterServicePawel Chojnacki2018-03-055-30/+84
| * | | | | | add missing newlinePawel Chojnacki2018-03-011-1/+1
| * | | | | | Implement PrometheusDeploymentLocator + fix metrics controllerPawel Chojnacki2018-03-014-27/+31
| * | | | | | 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-243-5/+3
View Lorry Controller Status