summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodulesStan Hu2018-03-301-1/+3
| | | | | | Any submodule lines that had a CR-LF ending would be ignored by the parser. Closes gitlab-org/gitlab-ce#2262
* Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-306-2/+216
|
* Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-302-1/+2
|\ | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042
| * closedby_id added to safe attributeshaseeb2018-03-011-1/+1
| |
| * closed by field addedhaseeb2018-02-281-0/+1
| |
* | Merge branch '44774-migrate-upload-task-fails-for-upload-with-store-nil' ↵Sean McGivern2018-03-301-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Migrate upload task fails for Upload with `store: nil`" Closes #44774 See merge request gitlab-org/gitlab-ce!18082
| * | apply feedbackMicaël Bergeron2018-03-301-1/+1
| | |
| * | fix rake migration task from ignoring Upload(store: nil)Micaël Bergeron2018-03-291-2/+2
| | |
* | | Merge branch '42593-restore-rake-task' into 'master'Douwe Maan2018-03-309-34/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Tweak restore rake task to provide an option to set alternate temporary backup directory Closes #42593 See merge request gitlab-org/gitlab-ce!17516
| * | | Move existing dirs to a temp location while restoreBalasankar "Balu" C2018-03-309-34/+49
| |/ / | | | | | | | | | | | | | | | | | | Instead of renaming existing storage directories to a timestamped format, create a timestamped directory in a temporary location and move the individual files and folders inside storage directories to it. This helps us with nested storage directories.
* | | Remove support for absolute dirs from Git::EnvJacob Vosmaer (GitLab)2018-03-305-45/+18
| | |
* | | Improve the ee_compat_check_job to handle gitlab-ee forksRémy Coutable2018-03-291-57/+91
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-03-291-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 stagesGrzegorz Bizon2018-03-291-0/+1
| | |
* | | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-294-4/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * | Remove Ci::Build#timeoutTomasz Maczukin2018-03-282-3/+3
| | |
| * | Use raw value of maximum_timeout for Runner registration APITomasz Maczukin2018-03-281-3/+2
| | |
| * | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-283-4/+4
| | |
| * | Update runner registration APITomasz Maczukin2018-03-281-2/+3
| | |
| * | Use _human_readable for Runner's registration APITomasz Maczukin2018-03-281-2/+2
| | |
| * | Rename job_upper_timeout to maximum_job_timeoutTomasz Maczukin2018-03-283-4/+4
| | |
| * | Add support for job_upper_timeout in APITomasz Maczukin2018-03-283-1/+4
| | |
* | | Merge branch 'dm-deploy-keys-default-user' into 'master'Sean McGivern2018-03-292-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 setDouwe Maan2018-03-281-4/+4
| | | |
| * | | Set user when adding deploy key to project using APIDouwe Maan2018-03-281-12/+11
| | | |
* | | | Gitlab-workhorse still needs RepoPath on Git HTTPJacob Vosmaer (GitLab)2018-03-291-10/+9
| | | |
* | | | Merge branch 'expose-commits-mr-api' into 'master'Rémy Coutable2018-03-281-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 APIMark Fletcher2018-03-261-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 Maan2018-03-281-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 entitiesSean McGivern2018-03-281-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 McGivern2018-03-281-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 2Jacob Vosmaer2018-03-281-4/+4
| |/ / / /
* | | | | Merge branch 'zj-remote-repo-exists' into 'master'Sean McGivern2018-03-283-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 cloningZeger-Jan van de Weg2018-03-273-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_postgresqlBob Van Landuyt2018-03-281-0/+2
| | | | | |
* | | | | | New migration helper for finding custom indexesBob Van Landuyt2018-03-281-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | This will use the same query as `\di` to find an index on postgresql.
* | | | | | Don't run ReworkRedirectRoutesIndexes during setupBob Van Landuyt2018-03-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `permanent` column is not there anymore, we don't need to create these indexes.
* | | | | | Remove permanent redirectsBob Van Landuyt2018-03-282-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 McGivern2018-03-281-4/+4
| | | | | | | | | | | | | | | This reverts merge request !18002
* | | | | Remove some easy cases of 'path_to_repo' useJacob Vosmaer (GitLab)2018-03-282-3/+1
| | | | |
* | | | | Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-03-281-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-encodingDouwe Maan2018-03-271-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-282-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 actionMayra Cabrera2018-03-261-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 Cabrera2018-03-262-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ński2018-03-281-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-ceAlessio Caiazza2018-03-271-8/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-271-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982
| * | | | | | API uses ProtectedBranchPolicy for destroy/createJames Edwards-Jones2018-03-261-1/+4
| | | | | | |
* | | | | | | Make all workhorse gitaly calls opt-outJacob Vosmaer (GitLab)2018-03-271-4/+4
| |/ / / / / |/| | | | |
View Lorry Controller Status