summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Remove permanent redirectsBob Van Landuyt2018-03-282-176/+28
* Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-281-22/+0
* Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'Douwe Maan2018-03-271-0/+11
|\
| * Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-211-0/+11
* | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-273-4/+155
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2214-165/+363
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0834-440/+987
| |\ \ \
| * | | | fix specsMicaël Bergeron2018-03-071-22/+0
| * | | | fix yet other specsMicaël Bergeron2018-03-072-4/+4
| * | | | fix some broken specsMicaël Bergeron2018-03-062-40/+12
| * | | | remove geo specific codeMicaël Bergeron2018-03-011-1/+1
| * | | | remove the license checkMicaël Bergeron2018-03-011-25/+0
| * | | | Merge branch 'fix/sm/atomic-migration' into 'master'Micaël Bergeron2018-03-011-0/+110
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2817-136/+610
| |\ \ \ \
| * \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2822-155/+1088
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2828-146/+706
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-282-15/+60
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-282-4/+7
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-282-60/+15
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2843-362/+1249
| |\ \ \ \ \ \ \
| * | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master'Kamil Trzciński2018-02-281-0/+58
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-1/+15
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2840-562/+1914
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2842-522/+2063
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2851-569/+2072
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-2840-311/+2418
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-28183-926/+1669
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-0/+44
* | | | | | | | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-261-110/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add specs for extracted pipeline-related methodsGrzegorz Bizon2018-03-221-0/+18
| * | | | | | | | | | | | | | Bring seeds size method back to CI/CD pipeline classGrzegorz Bizon2018-03-221-0/+17
| * | | | | | | | | | | | | | Move policy related specs our of YAML processor testsGrzegorz Bizon2018-03-221-91/+196
| * | | | | | | | | | | | | | Reduce stage seeds coupling between pipeline and YAMLGrzegorz Bizon2018-03-211-22/+0
| * | | | | | | | | | | | | | Start building abstraction over pipeline seedsGrzegorz Bizon2018-03-211-1/+2
* | | | | | | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-232-49/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-222-49/+142
* | | | | | | | | | | | | | | | Merge branch '43771-improve-avatar-error-message' into 'master'Sean McGivern2018-03-233-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Change avatar error message to include allowed file formatsFabian Schneider2018-03-223-3/+3
* | | | | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-232-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-212-3/+3
* | | | | | | | | | | | | | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-211-2/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'update-licensee' into 'master'Douwe Maan2018-03-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix test failures with licensee 8.9Pirate Praveen2018-03-201-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-201-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failedTomasz Maczukin2018-03-201-0/+29
* | | | | | | | | | | | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-194-3/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomicAndreas Brandl2018-03-181-0/+13
| * | | | | | | | | | | | | | | Address review comments.Andreas Brandl2018-03-161-1/+5
| * | | | | | | | | | | | | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-161-1/+7
| * | | | | | | | | | | | | | | Backwards-compat for migration specs.Andreas Brandl2018-03-161-2/+17