summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* fix rake migration task from ignoring Upload(store: nil)Micaël Bergeron2018-03-291-2/+2
* Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-03-291-0/+1
|\
| * 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
|\ \ | |/ |/|
| * 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
|\ \
| * | 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 APIMark Fletcher2018-03-261-0/+14
* | | | Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into 'ma...Douwe Maan2018-03-281-2/+6
|\ \ \ \
| * | | | Fix auto-linking with escaped HTML entitiesSean McGivern2018-03-281-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'fix-workhorse-test' into 'master'Sean McGivern2018-03-281-4/+4
|\ \ \ \
| * | | | 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 cloningZeger-Jan van de Weg2018-03-273-2/+21
* | | | | 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
* | | | | Don't run ReworkRedirectRoutesIndexes during setupBob Van Landuyt2018-03-281-2/+0
* | | | | Remove permanent redirectsBob Van Landuyt2018-03-282-25/+5
| |/ / / |/| | |
* | | | Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"Sean McGivern2018-03-281-4/+4
* | | | 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 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
|\ \ \ \
| * | | | Changes ci/lints controller to use authorize before actionMayra Cabrera2018-03-261-0/+1
| * | | | Make ci/lint page context aware:Mayra Cabrera2018-03-262-5/+5
* | | | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-8/+0
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
| |/ / / / |/| | | |
* | | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-2713-17/+289
|\ \ \ \ \
| * | | | | Backport EE changesMicaël Bergeron2018-03-221-0/+0
| * | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2256-161/+732
| |\ \ \ \ \
| * | | | | | Fix http_io to make it return path is nilShinya Maeda2018-03-221-1/+1
| * | | | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-221-0/+4
| * | | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078...Micaël Bergeron2018-03-091-23/+0
| |\ \ \ \ \ \
| | * | | | | | apply feedbackMicaël Bergeron2018-03-091-23/+0
| * | | | | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-096-16/+16
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08171-2611/+4481
| |\ \ \ \ \ \
| * | | | | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-086-0/+179
| * | | | | | | fix some broken specsMicaël Bergeron2018-03-061-1/+4
View Lorry Controller Status