summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
| * | | | | | | | | Fix rubocopPawel Chojnacki2018-01-301-0/+1
| * | | | | | | | | enable manual configuration property for all test prometheus servicesPawel Chojnacki2018-01-301-1/+2
| * | | | | | | | | fix service generic testsPawel Chojnacki2018-01-301-4/+1
| * | | | | | | | | Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2...Mike Greiling2018-01-291-76/+64
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix values.yaml for PrometheusJoshua Lambert2018-01-261-76/+64
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-291026-10120/+17067
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check if service is templatePawel Chojnacki2018-01-171-0/+1
| * | | | | | | | | | | add manual_configuration to prometheus_service factory to enable it by defaultPawel Chojnacki2018-01-171-0/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-171388-13895/+36568
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add Changelog itemPawel Chojnacki2018-01-041-0/+6
| * | | | | | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-044-13/+19
| * | | | | | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-042-2/+58
| * | | | | | | | | | | | add tests for Manual configuration override and service activation synchroniz...Pawel Chojnacki2018-01-041-0/+66
| * | | | | | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-043-49/+52
| * | | | | | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-045-19/+147
| * | | | | | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-042-10/+21
| * | | | | | | | | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-048-24/+65
| * | | | | | | | | | | | Auto enable prometheus service if Prometheus is InstalledPawel Chojnacki2018-01-021-4/+6
| * | | | | | | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-022-8/+29
| * | | | | | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-023-44/+22
| * | | | | | | | | | | | wipPawel Chojnacki2018-01-026-28/+99
* | | | | | | | | | | | | Merge branch '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-078-3/+250
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add `convertObjectPropsToCamelCase` helper methodKushal Pandya2018-02-072-0/+50
| * | | | | | | | | | | | | Add `convertToCamelCase` helper methodKushal Pandya2018-02-072-0/+13
| * | | | | | | | | | | | | Add `8px` padding optionKushal Pandya2018-02-071-0/+1
| * | | | | | | | | | | | | Update tests for date helper functionsKushal Pandya2018-02-071-0/+64
| * | | | | | | | | | | | | Add more date helper functionsKushal Pandya2018-02-071-2/+121
| * | | | | | | | | | | | | Add support for adding custom class on content wrapper elementKushal Pandya2018-02-071-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fj-removing-disable-gitaly-flags' into 'master'Sean McGivern2018-02-075-368/+406
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-075-368/+406
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-076-36/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-076-36/+33
* | | | | | | | | | | | | | Merge branch '34416-issue-i18n' into 'master'Sean McGivern2018-02-0718-86/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Translate issuable sidebar34416-issue-i18nJarka Kadlecová2018-02-0718-86/+284
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-0733-6/+1002
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-0733-6/+1002
* | | | | | | | | | | | | | | Merge branch 'fix/reduce-number-of-ref-exists-calls' into 'master'Sean McGivern2018-02-072-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-callsAhmad Sherif2018-02-071-4/+1
| * | | | | | | | | | | | | | | Check for keep-around commits once if target and source projects are the sameAhmad Sherif2018-02-071-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs/add-retrieving-external-ip' into 'master'Marcia Ramos2018-02-072-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add how to get the external ip of a clusterFabio Busatto2018-02-072-0/+40
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '41763-search-api' into 'master'Sean McGivern2018-02-0720-117/+1506
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Small code/doc changes41763-search-apiJarka Kadlecová2018-02-072-10/+16
| * | | | | | | | | | | | | | port ee changesJarka Kadlecová2018-02-073-96/+105
| * | | | | | | | | | | | | | Return only limited pagination headers for search API endpointsJarka Kadlecová2018-02-067-12/+26
| * | | | | | | | | | | | | | Support search in APIJarka Kadlecová2018-02-0619-26/+1386
* | | | | | | | | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-077-26/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update style of yaml_processor_spec.rbKamil Trzciński2018-02-071-2/+7
| * | | | | | | | | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-077-25/+37