summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44392-resolve-projects-creation-silently-failing-on-after-creat...Douwe Maan2018-03-281-0/+1
|\
| * When a Service templates are invalid newly created projects will have them in...Tiago Botelho2018-03-281-0/+1
* | Remove permanent redirectsBob Van Landuyt2018-03-282-49/+5
* | Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-282-5/+1
* | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-0/+6
|\ \
| * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-0/+6
* | | Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'Douwe Maan2018-03-271-10/+17
|\ \ \
| * | | Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-10/+17
* | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-1/+1
| |/ / |/| |
* | | 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-276-13/+46
|\ \ \ \
| * | | | remove EE-only codeMicaël Bergeron2018-03-221-2/+0
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2226-295/+428
| |\ \ \ \
| * | | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-222-1/+4
| * | | | | apply feedbackMicaël Bergeron2018-03-091-1/+0
| * | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0851-260/+660
| |\ \ \ \ \
| * | | | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-081-0/+4
| * | | | | | fixing some broken mergesMicaël Bergeron2018-03-021-8/+0
| * | | | | | remove geo specific codeMicaël Bergeron2018-03-011-1/+1
| * | | | | | add the Ci::Build `*_store` columnMicaël Bergeron2018-03-011-0/+4
| * | | | | | port the object storage to CEMicaël Bergeron2018-03-015-16/+28
| * | | | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2830-85/+286
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2831-158/+424
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2848-268/+336
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-287-60/+60
| * | | | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-283-3/+6
| * | | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-289-66/+64
| * | | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2851-293/+654
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-282-0/+16
| * | | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-13/+1
| * | | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2868-500/+1256
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2849-370/+1053
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2872-396/+943
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-282-0/+3
| * | | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-2883-563/+1611
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-2852-522/+1000
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-5/+15
* | | | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-261-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove outdates TODOs from pipeline classGrzegorz Bizon2018-03-231-4/+0
| * | | | | | | | | | | | | | | | Bring seeds size method back to CI/CD pipeline classGrzegorz Bizon2018-03-221-0/+4
| * | | | | | | | | | | | | | | | Fix static analysis and tests related to YAML processingGrzegorz Bizon2018-03-221-1/+1
| * | | | | | | | | | | | | | | | Decouple YAML processor from pipeline objectsGrzegorz Bizon2018-03-221-1/+7
| * | | | | | | | | | | | | | | | Make it easier to test pipeline stage seedsGrzegorz Bizon2018-03-211-0/+3
| * | | | | | | | | | | | | | | | Reduce stage seeds coupling between pipeline and YAMLGrzegorz Bizon2018-03-211-8/+0
| * | | | | | | | | | | | | | | | Support building all pipeline resource before savingGrzegorz Bizon2018-03-211-6/+2
| * | | | | | | | | | | | | | | | Introduce pipeline build seedsGrzegorz Bizon2018-03-211-0/+17
* | | | | | | | | | | | | | | | | Merge branch '43552-user-owned-projects-query-performance-improvement' into '...Douwe Maan2018-03-261-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Improves User#owned_projects query performanceTiago Botelho2018-03-261-3/+10