| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 3 | -0/+42 |
| |\ | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| | * | Add explicit primary key for ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 2 | -3/+5 |
| | | | |||||
| | * | Add project_id column to Ci::BuildMetadata | Tomasz Maczukin | 2018-03-28 | 2 | -0/+8 |
| | | | |||||
| | * | Rename used_timeout to timeout | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | |||||
| | * | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -10/+10 |
| | | | |||||
| | * | Refactorize Ci::Build and Ci::BuildMetadata models | Tomasz Maczukin | 2018-03-28 | 3 | -21/+8 |
| | | | |||||
| | * | Move job timeout information to new ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 4 | -13/+36 |
| | | | |||||
| | * | Change timeout_source to enum | Tomasz Maczukin | 2018-03-28 | 2 | -2/+2 |
| | | | |||||
| | * | Use change instead of up/down in simple migrations | Tomasz Maczukin | 2018-03-28 | 2 | -11/+2 |
| | | | |||||
| | * | Show timeout information on job's page | Tomasz Maczukin | 2018-03-28 | 2 | -0/+17 |
| | | | |||||
| | * | Rename job_upper_timeout to maximum_job_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -14/+14 |
| | | | |||||
| | * | Add new column to ci_runners table | Tomasz Maczukin | 2018-03-28 | 2 | -0/+14 |
| | | | |||||
| * | | Add the RedirectRoute#path index setup_postgresql | Bob Van Landuyt | 2018-03-28 | 1 | -9/+9 |
| | | | |||||
| * | | Add index on lower path to redirect routes | Bob Van Landuyt | 2018-03-28 | 1 | -0/+38 |
| | | | | | | | | | | | This will speed up the LIKE query in RedirectRoute.matching_path_and_descendants | ||||
| * | | Remove `permanent` from `redirect_routes` | Bob Van Landuyt | 2018-03-28 | 2 | -1/+37 |
| |/ | | | | | | This removes the column that was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15670 since we will no longer be allowing _permanent_ redirects | ||||
| * | Remove unused index from events table. | Andreas Brandl | 2018-03-27 | 2 | -2/+19 |
| | | | | | Closes #44467. | ||||
| * | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 5 | -0/+68 |
| |\ | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358 | ||||
| | * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 12 | -82/+338 |
| | |\ | |||||
| | * | | Backport ee-40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 1 | -10/+3 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 20 | -3/+548 |
| | |\ \ | |||||
| | * | | | another round of EE code removal | Micaël Bergeron | 2018-03-02 | 1 | -5/+2 |
| | | | | | |||||
| | * | | | remove geo specific code | Micaël Bergeron | 2018-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | rework the migration to use the EE ones | Micaël Bergeron | 2018-03-01 | 5 | -38/+54 |
| | | | | | |||||
| | * | | | add the Ci::Build `*_store` column | Micaël Bergeron | 2018-03-01 | 2 | -21/+23 |
| | | | | | |||||
| | * | | | fix the prepare_untracked_uploads_spec from using the EE schema | Micaël Bergeron | 2018-03-01 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix the EE migrations | Micaël Bergeron | 2018-03-01 | 5 | -62/+38 |
| | | | | | |||||
| | * | | | port the object storage to CE | Micaël Bergeron | 2018-03-01 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 17 | -33/+271 |
| | |\ \ \ | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 13 | -7/+344 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 21 | -44/+637 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 2 | -21/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8. | ||||
| | * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 3 | -1/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 | ||||
| | * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵ | Kamil Trzciński | 2018-02-28 | 39 | -40/+710 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276 | ||||
| | * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 76 | -75/+1255 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵ | Kamil Trzciński | 2018-02-28 | 21 | -16/+586 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵ | Kamil Trzciński | 2018-02-28 | 40 | -10/+1032 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 2 | -0/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can migrate LFS objects to S3 style object storage Closes #2841 See merge request !2760 | ||||
| | * | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into ↵ | Kamil Trzciński | 2018-02-28 | 67 | -289/+1150 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵ | Kamil Trzciński | 2018-02-28 | 30 | -27/+800 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object store for artifacts Closes gitlab-ce#29203 See merge request !1762 | ||||
| * | | | | | | | | | | | | | Merge branch ↵ | Grzegorz Bizon | 2018-03-26 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master' Send notification emails when push to a merge request Closes #23460 See merge request gitlab-org/gitlab-ce!17865 | ||||
| | * | | | | | | | | | | | | | Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request | YarNayar | 2018-03-26 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23460 | ||||
| * | | | | | | | | | | | | | | Merge branch 'pages_force_https' into 'master' | Nick Thomas | 2018-03-23 | 3 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273 | ||||
| | * | | | | | | | | | | | | | Add HTTPS-only pages | Rob Watson | 2018-03-22 | 3 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28857 | ||||
| * | | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master' | Sean McGivern | 2018-03-23 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743 | ||||
| | * | | | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-access | Jacob Vosmaer | 2018-03-21 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into 'latest-security-to-master-21-03-18' | James Lopez | 2018-03-22 | 6 | -33/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock | ||||
| | * | | | | | | | | | | | | | Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master' | Yorick Peterse | 2018-03-21 | 2 | -1/+43 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add indexes for user activity queries. Closes #44446 See merge request gitlab-org/gitlab-ce!17890 | ||||
| | | * | | | | | | | | | | | | | Guard creation/removal with existence checks. | Andreas Brandl | 2018-03-21 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |