summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Douwe Maan2018-03-281-0/+1
|\ | | | | | | | | | | | | | | | | '44392-resolve-projects-creation-silently-failing-on-after-create-error' into 'master' Resolve "For new created projects permissions are not inherited from group level" Closes #44692 See merge request gitlab-org/gitlab-ce!18013
| * When a Service templates are invalid newly created projects will have them ↵Tiago Botelho2018-03-281-0/+1
| | | | | | | | inactive
* | Remove permanent redirectsBob Van Landuyt2018-03-282-49/+5
| | | | | | | | | | Removes permanent redirects, this means that redirects will only be possible as long as the old route isn't taken by a new project/group.
* | 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
|\ \ | | | | | | | | | | | | | | | | | | LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
| * | 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` See merge request gitlab-org/gitlab-ce!17908
| * | | Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would issue a query for each unique `diff_refs_or_sha` passed. This was because we didn't want to load other MR diffs into memory, as they had some very large columns. Now they are actually very small, and it's more efficient to just load them all at once and do the finding in Ruby.
* | | | '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 ↵Kamil Trzciński2018-03-272-7/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port to CE: Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored" See merge request gitlab-org/gitlab-ce!17904
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change find_cluster_platform_kubernetes to ignore environment argument - Fix broken specs CE Port of: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5047/
* | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-276-13/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request gitlab-org/gitlab-ee!4753
| * | | | | | 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-backportKamil Trzciński2018-02-2830-85/+286
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński2018-02-2831-158/+424
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
| * | | | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-283-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258
| * | | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-289-66/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
| * | | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński2018-02-2851-293/+654
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-282-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transfer job archives after creation See merge request gitlab-org/gitlab-ee!3646
| * | | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276
| * | | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵Kamil Trzciński2018-02-2868-500/+1256
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵Kamil Trzciński2018-02-2849-370/+1053
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵Kamil Trzciński2018-02-2872-396/+943
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-282-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can migrate LFS objects to S3 style object storage Closes #2841 See merge request !2760
| * | | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into ↵Kamil Trzciński2018-02-2883-563/+1611
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵Kamil Trzciński2018-02-2852-522/+1000
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object store for artifacts Closes gitlab-ce#29203 See merge request !1762
* | | | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-261-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how we populate pipeline with stages and builds Closes #43941 See merge request gitlab-org/gitlab-ce!17841
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first step to decouple pipeline from YAML processing. It reduces the coupling by removing some methods that introduce coupling and by moving logic into separate chain element that is being used to populate pipelines with stages and builds.
| * | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Slow SQL running in production queryid 3257994922" Closes #43552 See merge request gitlab-org/gitlab-ce!17934
| * | | | | | | | | | | | | | | | | Improves User#owned_projects query performanceTiago Botelho2018-03-261-3/+10
| | | | | | | | | | | | | | | | | |