summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* better headerdocs-article-devops-gamedevMarcia Ramos2018-03-061-1/+1
* fix internal linksMarcia Ramos2018-03-061-5/+5
* fixes headers (doc structure)Marcia Ramos2018-03-061-6/+6
* reviewMarcia Ramos2018-03-065-18/+25
* Merge branch 'docs/devops-gamedev-gitlab' into 'docs-article-devops-gamedev'Marcia Ramos2018-03-064-0/+523
|\
| * Docs/devops gamedev gitlabRyan2018-03-064-0/+523
|/
* 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
| * | | | Use deployment platform to find cluster with prometheus applicationPawel Chojnacki2018-02-242-53/+12
| * | | | Squashed commit of the following:Pawel Chojnacki2018-02-2429-364/+388
* | | | | 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 'extract-job-artifacts-api-ce' into 'master'Rémy Coutable2018-03-061-4/+13
|\ \ \ \ \ \
| * | | | | | Unify lib/api/job_artifacts.rb with EEextract-job-artifacts-api-ceLin Jen-Shin2018-03-061-4/+13
| |/ / / / /
* | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-03-0621-1633/+21544
|\ \ \ \ \ \
| * | | | | | Add Turkish, Filipino and Indonesianbvl-port-of-ee-translationsBob Van Landuyt2018-03-052-1/+9
| * | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-03-0519-1632/+21535
* | | | | | | Merge branch 'sh-dashboard-sort-fix' into 'master'Douwe Maan2018-03-064-2/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix project dashboard showing the wrong timestampssh-dashboard-sort-fixStan Hu2018-03-054-2/+30
* | | | | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-0620-120/+392
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix tests by latest proposal changesproper-fix-for-artifacts-serviceShinya Maeda2018-03-067-37/+7
| * | | | | | | | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu...Shinya Maeda2018-03-0611-19/+115
| * | | | | | | | Define Trace::ArchiveError to make it explit as an errorShinya Maeda2018-03-062-9/+9
| * | | | | | | | 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-062-1/+2
| * | | | | | | | Fix spec failure on mysql because it can not store long tracesShinya Maeda2018-03-061-1/+1
| * | | | | | | | Fix static analysysShinya Maeda2018-03-062-7/+8
| * | | | | | | | Add spec for workersShinya Maeda2018-03-062-4/+32
| * | | | | | | | Fix rake task to use corrrect SQLShinya Maeda2018-03-062-5/+59
View Lorry Controller Status