summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-272-7/+17
|\
| * Re-arrange deployment_platform to avoid cop complainments5347-fix-multiple-clusters-incorrect-details-injectedMayra Cabrera2018-03-261-4/+10
| * Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-222-4/+8
* | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2731-104/+812
|\ \
| * | personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-262-1/+6
| * | fix the failing specsMicaël Bergeron2018-03-221-1/+2
| * | remove EE-only codeMicaël Bergeron2018-03-221-2/+0
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-22510-3294/+9259
| |\ \
| * | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-223-6/+4
| * | | fix an indentation problemMicaël Bergeron2018-03-121-1/+1
| * | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078...Micaël Bergeron2018-03-094-14/+16
| |\ \ \
| | * | | apply feedbackMicaël Bergeron2018-03-094-14/+16
| * | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-093-10/+18
| |/ / /
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08551-6193/+6363
| |\ \ \
| * | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-081-0/+4
| * | | | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-084-27/+47
| * | | | fix some broken specsMicaël Bergeron2018-03-062-2/+0
| * | | | fixing some broken mergesMicaël Bergeron2018-03-024-12/+4
| * | | | another round of EE code removalMicaël Bergeron2018-03-021-3/+5
| * | | | remove geo specific codeMicaël Bergeron2018-03-013-10/+25
| * | | | Merge branch 'fix/sm/atomic-migration' into 'master'Micaël Bergeron2018-03-011-27/+51
| * | | | add the Ci::Build `*_store` columnMicaël Bergeron2018-03-011-0/+4
| * | | | fix the prepare_untracked_uploads_spec from using the EE schemaMicaël Bergeron2018-03-011-0/+1
| * | | | remove the license checkMicaël Bergeron2018-03-011-12/+0
| * | | | another round of fixesMicaël Bergeron2018-03-015-7/+246
| * | | | port the object storage to CEMicaël Bergeron2018-03-019-19/+351
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-28604-3653/+4795
| |\ \ \ \
| * | | | | Merge branch 'fix/sm/atomic-migration' into 'master'Kamil Trzciński2018-02-281-2/+1
| * | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-28338-1771/+4204
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-28733-8914/+11864
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-2827-416/+341
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-289-5/+48
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-2831-550/+460
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-28627-5895/+9964
| |\ \ \ \ \ \ \
| * | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-285-6/+28
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-286-61/+29
| * | | | | | | | Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' into...Kamil Trzciński2018-02-281-11/+13
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-28742-6742/+11619
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-28674-8209/+12427
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-28778-6409/+9884
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-2810-41/+113
| * | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-28868-6445/+14417
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-28756-5294/+11795
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-286-33/+187
* | | | | | | | | | | | | | Merge branch 'dz-improve-app-settings' into 'master'Filipa Lacerda2018-03-269-251/+343
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Put forms from expandable sections into fieldset to ensure proper animationDmitriy Zaporozhets2018-03-266-222/+237
| * | | | | | | | | | | | | | Remove gray background from app setting expandable sectionsDmitriy Zaporozhets2018-03-267-24/+18
| * | | | | | | | | | | | | | Improve application settings page according to feedbackDmitriy Zaporozhets2018-03-267-12/+12
| * | | | | | | | | | | | | | Move UI of several application settings to expandable blockdz-improve-app-settingsDmitriy Zaporozhets2018-03-269-251/+334
* | | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-264-34/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status