summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* use commander for safer cli argument parsingLukas Eipert2018-04-111-5/+13
* move TEST_FILES variable to `process.env`Lukas Eipert2018-04-101-1/+1
* remove unnecessary webpack plugins assignment in karma configLukas Eipert2018-04-101-2/+0
* read which testfiles to run from CLILukas Eipert2018-04-101-1/+6
* Merge branch 'master' into winh-single-karma-testLukas Eipert2018-04-1060-528/+1069
|\
| * Projects and groups badges settings UIFrancisco Javier López2018-04-083-1/+3
| * Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-061-2/+4
| * Create barebones for DeploytokenMayra Cabrera2018-04-061-0/+6
| * Add Kubernetes CPU/Mem usage totalsJoshua Lambert2018-04-061-5/+23
| * Update labels for latency, cpu and memory metricsJose Ivan Vargas2018-04-061-3/+3
| * Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-062-3/+6
| |\
| | * Add new repository archive routeJames Ramsay2018-04-062-3/+6
| * | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-061-14/+17
| * | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-052-0/+8
| |\ \
| | * | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-052-0/+8
| * | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ...Kamil Trzciński2018-04-051-1/+1
| |\ \ \
| | * | | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-041-1/+1
| * | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-052-13/+16
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-042-13/+16
| | |/
| * | Add support for Sidekiq JSON loggingStan Hu2018-04-043-1/+18
| |/
| * Use katex min cssClement Ho2018-03-281-1/+1
| * Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-282-1/+5
| |\
| | * Move project ci lint under '-' scope43603-ci-lint-supportMayra Cabrera2018-03-261-4/+4
| | * Make ci/lint page context aware:Mayra Cabrera2018-03-262-1/+5
| * | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-283-15/+4
| |\ \
| | * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-273-15/+4
| * | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-1/+22
| |\ \ \ | | |/ / | |/| |
| | * | Adds JWT omnianuth integrationTiago Botelho2018-03-201-1/+22
| * | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-0/+109
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2213-248/+217
| | |\ \
| | * | | apply feedbackMicaël Bergeron2018-03-221-7/+0
| | * | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-222-15/+12
| | * | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-092-0/+6
| | * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0816-144/+129
| | |\ \ \
| | * | | | fix the prepare_untracked_uploads_spec from using the EE schemaMicaël Bergeron2018-03-011-0/+1
| | * | | | port the object storage to CEMicaël Bergeron2018-03-012-0/+7
| | * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2814-68/+115
| | |\ \ \ \
| | * | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master'Kamil Trzciński2018-02-281-9/+9
| | * | | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'Sean McGivern2018-02-281-0/+20
| | * | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2810-3/+133
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2822-74/+223
| | |\ \ \ \ \ \
| | | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-282-19/+2
| | * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-282-9/+52
| | * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2817-45/+110
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-281-0/+1
| | * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-0/+1
| | * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2827-63/+201
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2823-129/+171
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2823-54/+233
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-283-3/+48
View Lorry Controller Status