summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* comment about a commentee-183-common-code-backportMario de la Ossa2018-03-061-0/+1
* Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-062-1/+22
* 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
| * | | | | | Raise an error if conditions are not fulfilled in archive methodShinya Maeda2018-03-062-4/+16
| * | | | | | Add changelogShinya Maeda2018-03-061-0/+5
| * | | | | | Add soec for achevie! method. Fixed the methodShinya Maeda2018-03-063-68/+131
| * | | | | | Use find_in_batches for rake taskShinya Maeda2018-03-061-3/+11
| * | | | | | Add object_storage queueShinya Maeda2018-03-061-0/+2
| * | | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactServiceShinya Maeda2018-03-065-51/+50
| * | | | | | Proper fix for artifacts trace migration which is fully safeKamil Trzciński2018-03-062-1/+34
* | | | | | | Merge branch '43798-document-required-pg-extensions' into 'master'Marcia Ramos2018-03-061-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Update docs to include information on the Geo extension43798-document-required-pg-extensionsJoshua Lambert2018-03-021-0/+8
* | | | | | | | Merge branch '43924-breadcrumbs-on-project-tags' into 'master'Phil Hughes2018-03-062-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra breadcrumb on tagsTakuya Noguchi2018-03-062-1/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-0626-25/+519
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | review: prefix un-used argument with underscoreTravis Miller2018-03-051-1/+1
| * | | | | | | review: rename import_export to import_export_sharedTravis Miller2018-03-0514-18/+18
View Lorry Controller Status