| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master' | Kamil Trzciński | 2018-03-29 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Fix background pipeline stages migration Closes #44135 See merge request gitlab-org/gitlab-ce!18076 | ||||
| | * | Do not use STI mechanisms when migrating pipeline stages | Grzegorz Bizon | 2018-03-29 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 4 | -4/+7 |
| |\ \ | |/ |/| | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| | * | Remove Ci::Build#timeout | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | |||||
| | * | Use raw value of maximum_timeout for Runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -3/+2 |
| | | | |||||
| | * | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -4/+4 |
| | | | |||||
| | * | Update runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+3 |
| | | | |||||
| | * | Use _human_readable for Runner's registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+2 |
| | | | |||||
| | * | Rename job_upper_timeout to maximum_job_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -4/+4 |
| | | | |||||
| | * | Add support for job_upper_timeout in API | Tomasz Maczukin | 2018-03-28 | 3 | -1/+4 |
| | | | |||||
| * | | Merge branch 'dm-deploy-keys-default-user' into 'master' | Sean McGivern | 2018-03-29 | 2 | -16/+15 |
| |\ \ | | | | | | | | | | | | | | | | | | | Ensure hooks run when a deploy key without a user pushes Closes #44317 See merge request gitlab-org/gitlab-ce!18057 | ||||
| | * | | Fall back on ghost user when deploy key user is not set | Douwe Maan | 2018-03-28 | 1 | -4/+4 |
| | | | | |||||
| | * | | Set user when adding deploy key to project using API | Douwe Maan | 2018-03-28 | 1 | -12/+11 |
| | | | | |||||
| * | | | Gitlab-workhorse still needs RepoPath on Git HTTP | Jacob Vosmaer (GitLab) | 2018-03-29 | 1 | -10/+9 |
| | | | | |||||
| * | | | Merge branch 'expose-commits-mr-api' into 'master' | Rémy Coutable | 2018-03-28 | 1 | -0/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | | Allow merge requests related to a commit to be found via API See merge request gitlab-org/gitlab-ce!18004 | ||||
| | * | | | Allow merge requests related to a commit to be found via API | Mark Fletcher | 2018-03-26 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | - Original work for the web interface here: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713 | ||||
| * | | | | Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into ↵ | Douwe Maan | 2018-03-28 | 1 | -2/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Reference parsing conflicting with auto-linking" Closes #44649 See merge request gitlab-org/gitlab-ce!18045 | ||||
| | * | | | | Fix auto-linking with escaped HTML entities | Sean McGivern | 2018-03-28 | 1 | -2/+6 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | We displayed the correct text as the link text (without double-encoding), but didn't do the same for the actual link target, so any link containing an ampersand would break when auto-linked. | ||||
| * | | | | Merge branch 'fix-workhorse-test' into 'master' | Sean McGivern | 2018-03-28 | 1 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make all workhorse gitaly calls opt-out, take 2 See merge request gitlab-org/gitlab-ce!18043 | ||||
| | * | | | | Make all workhorse gitaly calls opt-out, take 2 | Jacob Vosmaer | 2018-03-28 | 1 | -4/+4 |
| | |/ / / | |||||
| * | | | | Merge branch 'zj-remote-repo-exists' into 'master' | Sean McGivern | 2018-03-28 | 3 | -2/+21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test if remote repository exists before cloning Closes #43929 and gitaly#1084 See merge request gitlab-org/gitlab-ce!18017 | ||||
| | * | | | | Test if remote repository exists before cloning | Zeger-Jan van de Weg | 2018-03-27 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a repository does not exist on a remote, Gitaly won't be able to clone it. This is correct behaviour, but from the clients perspective a change in behaviour. This change implements the client side changes that allows Gitaly to execute a `git ls-remote <remote-url> HEAD`. This way the client has no need to shell out to Git. In the situation where multiple Gitalies are available, one is chosen at random. This commit closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43929, while its also a part of https://gitlab.com/gitlab-org/gitaly/issues/1084 | ||||
| * | | | | | Add the RedirectRoute#path index setup_postgresql | Bob Van Landuyt | 2018-03-28 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | New migration helper for finding custom indexes | Bob Van Landuyt | 2018-03-28 | 1 | -4/+35 |
| | | | | | | | | | | | | | | | | | | | | | This will use the same query as `\di` to find an index on postgresql. | ||||
| * | | | | | 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. | ||||
| * | | | | | Remove permanent redirects | Bob Van Landuyt | 2018-03-28 | 2 | -25/+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. | ||||
| * | | | | Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'" | Sean McGivern | 2018-03-28 | 1 | -4/+4 |
| | | | | | | | | | | | | | This reverts merge request !18002 | ||||
| * | | | | Remove some easy cases of 'path_to_repo' use | Jacob Vosmaer (GitLab) | 2018-03-28 | 2 | -3/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dm-refs-contains-sha-encoding' into 'master' | Sean McGivern | 2018-03-28 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix listing commit branch/tags that contain special characters Closes #43212 See merge request gitlab-org/gitlab-ce!18023 | ||||
| | * | | | | Fix listing commit branch/tags that contain special charactersdm-refs-contains-sha-encoding | Douwe Maan | 2018-03-27 | 1 | -1/+2 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch '43603-ci-lint-support' into 'master' | Kamil Trzciński | 2018-03-28 | 2 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "/ci/lint should support include keyword in config file" Closes #43603 See merge request gitlab-org/gitlab-ce!17729 | ||||
| | * | | | | Changes ci/lints controller to use authorize before action | Mayra Cabrera | 2018-03-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a comment on Ci::Config regarding that's going to be override by EE | ||||
| | * | | | | Make ci/lint page context aware: | Mayra Cabrera | 2018-03-26 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create ci/lints controller inside project/ - Move js pages to be inside projects/ - Copy view ci/lint view to be inside project folder - Remove ci/lint view and js files Closes #43603 | ||||
| * | | | | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' | Kamil Trzciński | 2018-03-28 | 1 | -8/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-ce | Alessio Caiazza | 2018-03-27 | 1 | -8/+0 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'jej/add-protected-branch-policy' into 'master' | Nick Thomas | 2018-03-27 | 1 | -1/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982 | ||||
| | * | | | | | API uses ProtectedBranchPolicy for destroy/create | James Edwards-Jones | 2018-03-26 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Make all workhorse gitaly calls opt-out | Jacob Vosmaer (GitLab) | 2018-03-27 | 1 | -4/+4 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 13 | -17/+289 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 56 | -161/+732 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix http_io to make it return path is nil | Shinya Maeda | 2018-03-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Backport ee-40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Micaël Bergeron | 2018-03-09 | 1 | -23/+0 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ce-40781-os-to-ce | ||||
| | | * | | | | | | apply feedback | Micaël Bergeron | 2018-03-09 | 1 | -23/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Add proxy_download to perform proxied sending of all files | Micaël Bergeron | 2018-03-09 | 6 | -16/+16 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 171 | -2611/+4481 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | [cherry-pick] '4862-verify-file-checksums' | Sean McGivern | 2018-03-08 | 6 | -0/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request gitlab-org/gitlab-ee!4753 | ||||
| | * | | | | | | | fix some broken specs | Micaël Bergeron | 2018-03-06 | 1 | -1/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | removed EE specific code from the port | Micaël Bergeron | 2018-03-01 | 1 | -0/+183 |
| | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |