Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 543 | -11966/+29559 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix a typo, a conflict and improve documentationissue_38337 | Felipe Artur | 2018-03-06 | 3 | -2/+5 | |
| * | | | | | | | | | | Address review comments | Felipe Artur | 2018-03-05 | 9 | -47/+31 | |
| * | | | | | | | | | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 66 | -469/+1744 | |
* | | | | | | | | | | | Merge branch 'prepend-grape-api-ce' into 'master' | Rémy Coutable | 2018-03-06 | 1 | -21/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ce | Lin Jen-Shin | 2018-03-06 | 1 | -21/+40 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rc/speedup-rake-jobs' into 'master' | Robert Speicher | 2018-03-06 | 1 | -131/+113 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | New .dedicated-no-docs-pull-cache-job and .no-db-job definitions | Rémy Coutable | 2018-03-06 | 1 | -136/+99 | |
| * | | | | | | | | | | Add date calls in .gitlab-ci.yml to see how long each step take | Rémy Coutable | 2018-03-06 | 1 | -0/+19 | |
* | | | | | | | | | | | Merge branch 'docs-devguide-cherry-pick-ce-to-ee' into 'master' | Achilleas Pipinellis | 2018-03-06 | 2 | -2/+140 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Docs guidelines: cherry-picking commits from CE to EE | Marcia Ramos | 2018-03-06 | 2 | -2/+140 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master' | Grzegorz Bizon | 2018-03-06 | 30 | -370/+403 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-ce | Pawel Chojnacki | 2018-03-06 | 1193 | -16194/+18833 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | Arg.id via method pointer | Pawel Chojnacki | 2018-03-06 | 1 | -1/+1 | |
| * | | | | | | | | | | one space too far | Pawel Chojnacki | 2018-03-05 | 1 | -1/+0 | |
| * | | | | | | | | | | Check if prometheus_adapter is properly called | Pawel Chojnacki | 2018-03-05 | 3 | -32/+21 | |
| * | | | | | | | | | | Implemente Prometheus:AdapterService | Pawel Chojnacki | 2018-03-05 | 5 | -30/+84 | |
| * | | | | | | | | | | add missing newline | Pawel Chojnacki | 2018-03-01 | 1 | -1/+1 | |
| * | | | | | | | | | | Implement PrometheusDeploymentLocator + fix metrics controller | Pawel Chojnacki | 2018-03-01 | 4 | -27/+31 | |
| * | | | | | | | | | | use deployment_platform DI in environment and revert changes to k8s cert veri... | Pawel Chojnacki | 2018-02-26 | 2 | -3/+7 | |
| * | | | | | | | | | | Fix failing test, when deployment platform is not bound to a cluster. | Pawel Chojnacki | 2018-02-26 | 1 | -2/+4 | |
| * | | | | | | | | | | drop the ! from synchronize_service_state! + remove unused scope | Pawel Chojnacki | 2018-02-24 | 3 | -5/+3 | |
| * | | | | | | | | | | Use deployment platform to find cluster with prometheus application | Pawel Chojnacki | 2018-02-24 | 2 | -53/+12 | |
| * | | | | | | | | | | Squashed commit of the following: | Pawel Chojnacki | 2018-02-24 | 29 | -364/+388 | |
* | | | | | | | | | | | Merge branch 'zj-lazy-parents' into 'master' | Douwe Maan | 2018-03-06 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Lazy fetch parent commits for a commit | Zeger-Jan van de Weg | 2018-03-06 | 1 | -2/+5 | |
* | | | | | | | | | | | | Merge branch 'extract-job-artifacts-api-ce' into 'master' | Rémy Coutable | 2018-03-06 | 1 | -4/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Unify lib/api/job_artifacts.rb with EEextract-job-artifacts-api-ce | Lin Jen-Shin | 2018-03-06 | 1 | -4/+13 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2018-03-06 | 21 | -1633/+21544 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add Turkish, Filipino and Indonesianbvl-port-of-ee-translations | Bob Van Landuyt | 2018-03-05 | 2 | -1/+9 | |
| * | | | | | | | | | | | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-03-05 | 19 | -1632/+21535 | |
* | | | | | | | | | | | | | Merge branch 'sh-dashboard-sort-fix' into 'master' | Douwe Maan | 2018-03-06 | 4 | -2/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix project dashboard showing the wrong timestampssh-dashboard-sort-fix | Stan Hu | 2018-03-05 | 4 | -2/+30 | |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master' | Grzegorz Bizon | 2018-03-06 | 20 | -120/+392 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix tests by latest proposal changesproper-fix-for-artifacts-service | Shinya Maeda | 2018-03-06 | 7 | -37/+7 | |
| * | | | | | | | | | | | | | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu... | Shinya Maeda | 2018-03-06 | 11 | -19/+115 | |
| * | | | | | | | | | | | | | Define Trace::ArchiveError to make it explit as an error | Shinya Maeda | 2018-03-06 | 2 | -9/+9 | |
| * | | | | | | | | | | | | | Change the place of definition of object_storage:archive_legacy_trace | Shinya Maeda | 2018-03-06 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Add object_storage queue to sidekiq_queues.ym. and correct queue name in all_... | Shinya Maeda | 2018-03-06 | 2 | -1/+2 | |
| * | | | | | | | | | | | | | Fix spec failure on mysql because it can not store long traces | Shinya Maeda | 2018-03-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Fix static analysys | Shinya Maeda | 2018-03-06 | 2 | -7/+8 | |
| * | | | | | | | | | | | | | Add spec for workers | Shinya Maeda | 2018-03-06 | 2 | -4/+32 | |
| * | | | | | | | | | | | | | Fix rake task to use corrrect SQL | Shinya Maeda | 2018-03-06 | 2 | -5/+59 | |
| * | | | | | | | | | | | | | Raise an error if conditions are not fulfilled in archive method | Shinya Maeda | 2018-03-06 | 2 | -4/+16 | |
| * | | | | | | | | | | | | | Add changelog | Shinya Maeda | 2018-03-06 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | Add soec for achevie! method. Fixed the method | Shinya Maeda | 2018-03-06 | 3 | -68/+131 | |
| * | | | | | | | | | | | | | Use find_in_batches for rake task | Shinya Maeda | 2018-03-06 | 1 | -3/+11 | |
| * | | | | | | | | | | | | | Add object_storage queue | Shinya Maeda | 2018-03-06 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactService | Shinya Maeda | 2018-03-06 | 5 | -51/+50 | |
| * | | | | | | | | | | | | | Proper fix for artifacts trace migration which is fully safe | Kamil Trzciński | 2018-03-06 | 2 | -1/+34 |