| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' | Rémy Coutable | 2018-05-25 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Resolve "gitlab 10.8 assumes that installation is a git working copy." Closes #46600 See merge request gitlab-org/gitlab-ce!19125 | ||||
| | * | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo | Rémy Coutable | 2018-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Fix backup creation and restore for specific Rake tasks | Stan Hu | 2018-05-24 | 1 | -67/+65 |
| |/ | |||||
| * | Increase text limit for GPG keys (mysql only).ab-46530-mediumtext-for-gpg-keys | Andreas Brandl | 2018-05-22 | 1 | -0/+2 |
| | | | | | Closes #46530. | ||||
| * | Migration to add/drop primary key constraints for composite keys.ab-43706-composite-primary-keys | Andreas Brandl | 2018-05-21 | 1 | -0/+15 |
| | | | | | Closes #43706. | ||||
| * | Fix: Use case in-sensitive ordering by name for groups | Harish Ved | 2018-05-17 | 1 | -0/+2 |
| | | |||||
| * | Clean up test.rake | blackst0ne | 2018-05-14 | 1 | -1/+0 |
| | | |||||
| * | Remove spinach.rake | blackst0ne | 2018-05-14 | 1 | -60/+0 |
| | | |||||
| * | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-30 | 1 | -0/+9 |
| |\ | |||||
| | * | Add gitlab-pages admin ping rake task | Jacob Vosmaer (GitLab) | 2018-04-27 | 1 | -0/+9 |
| | | | |||||
| * | | Refactoring ci_job_trace to ci_build_trace | Shinya Maeda | 2018-04-26 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-26 | 2 | -7/+3 |
| |\ \ | |/ | |||||
| | * | Gitlab::Shell works on shard name, not path | Zeger-Jan van de Weg | 2018-04-25 | 2 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111 | ||||
| * | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-20 | 2 | -2/+13 |
| |\ \ | |/ | |||||
| | * | Check Gitaly when running `rake dev:setup` | Zeger-Jan van de Weg | 2018-04-19 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, trying to setup dev environment could be tried without having at least one Gitaly running. Cloning the repositories would fail, but not stop the setup. Given this would lead to an inconsistent state, a check was added if we could connect to the server. Output when it fails: ``` $ rake dev:setup Failed to connect to Gitaly... Error: 14:Connect Failed ``` | ||||
| | * | Resolve "Make a Rubocop that forbids returning from a block" | 🙈 jacopo beschi 🙉 | 2018-04-18 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-17 | 1 | -9/+14 |
| |\ \ | |/ | |||||
| | * | Allow `rake cache:clear` clearing pipeline status cache44582-clear-pipeline-status-cache | Lin Jen-Shin | 2018-04-10 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | * Use the correct key prefix * Clear old cache keys TODO: At some point we could remove clearing old cache keys. | ||||
| * | | Add rake task and timestamped migration file for mysql raw_data MIDIUMTEXT | Shinya Maeda | 2018-04-06 | 1 | -0/+2 |
| |/ | |||||
| * | Merge branch '44902-remove-rake-test-ci' into 'master' | Robert Speicher | 2018-04-03 | 1 | -5/+0 |
| |\ | | | | | | | | | | | | | Remove Rake test_ci task Closes #44902 See merge request gitlab-org/gitlab-ce!18139 | ||||
| | * | Remove test_ci rake task | Takuya Noguchi | 2018-04-03 | 1 | -5/+0 |
| | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
| * | | Use gitlab_environment because we need: | Lin Jen-Shin | 2018-04-03 | 1 | -1/+1 |
| |/ | | | | | * ask_to_continue * Gitlab::TaskAbortedByUserError | ||||
| * | fix the rake task from being to strict about Group | Micaël Bergeron | 2018-04-02 | 1 | -0/+1 |
| | | |||||
| * | apply feedback | Micaël Bergeron | 2018-03-30 | 1 | -1/+1 |
| | | |||||
| * | fix rake migration task from ignoring Upload(store: nil) | Micaël Bergeron | 2018-03-29 | 1 | -2/+2 |
| | | |||||
| * | Add the RedirectRoute#path index setup_postgresql | Bob Van Landuyt | 2018-03-28 | 1 | -0/+2 |
| | | |||||
| * | Don't run ReworkRedirectRoutesIndexes during setup | Bob Van Landuyt | 2018-03-28 | 1 | -2/+0 |
| | | | | | | Since the `permanent` column is not there anymore, we don't need to create these indexes. | ||||
| * | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 3 | -0/+80 |
| |\ | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358 | ||||
| | * | Backport EE changes | Micaël Bergeron | 2018-03-22 | 1 | -0/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 4 | -10/+18 |
| | |\ | |||||
| | * | | apply feedback | Micaël Bergeron | 2018-03-09 | 1 | -23/+0 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 6 | -71/+45 |
| | |\ \ | |||||
| | * | | | [cherry-pick] '4862-verify-file-checksums' | Sean McGivern | 2018-03-08 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | See merge request gitlab-org/gitlab-ee!4753 | ||||
| | * | | | another round of fixes | Micaël Bergeron | 2018-03-01 | 3 | -0/+86 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 4 | -3/+54 |
| | |\ \ \ | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 21 | -244/+150 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -103/+72 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276 | ||||
| | * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 7 | -89/+143 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵ | Kamil Trzciński | 2018-02-28 | 5 | -49/+32 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵ | Kamil Trzciński | 2018-02-28 | 7 | -12/+150 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | | | | Merge branch 'zj-fix-resolver-issue' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch out resolver to mitigate SocketError See merge request !2809 | ||||
| | * | | | | | | | | | | Merge branch 'zj-improve-object-store-rake-task' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper logging for artifacts rake task See merge request !2762 | ||||
| | * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 2 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -215/+88 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵ | Kamil Trzciński | 2018-02-28 | 12 | -17/+73 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| | * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object store for artifacts Closes gitlab-ce#29203 See merge request !1762 | ||||
| * | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master' | Sean McGivern | 2018-03-23 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |