summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-092-2/+91
|\
| * Make Gitlab::CurrentSettings available when getting settingsSean McGivern2018-01-081-8/+8
| * Backport authorized_keys_enabled defaults to true'Michael Kozono2018-01-081-2/+56
| * Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-0/+12
| * Backport authorized_keys branch 'find-key-by-fingerprint'Pablo Carranza2018-01-081-0/+23
* | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-091-1/+1
|\ \
| * | Merge branch 'check-environment-regex' into 'master'Grzegorz Bizon2018-01-081-1/+1
* | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logsStan Hu2018-01-081-0/+18
* | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into 'm...Stan Hu2018-01-082-3/+6
|\ \ \
| * | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-052-3/+6
* | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-082-0/+17
|\ \ \ \
| * | | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-052-0/+17
| | |_|/ | |/| |
* | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-082-4/+7
|\ \ \ \
| * | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-042-4/+7
* | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-082-13/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-052-13/+26
* | | | | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-073-8/+16
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-0622-145/+623
| |\ \ \ \ \
| * | | | | | Bump import/export version to 2.2.0Grzegorz Bizon2018-01-051-1/+1
| * | | | | | Assign stage and pipeline to a status when importingGrzegorz Bizon2018-01-052-7/+15
* | | | | | | Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-1/+1
| |/ / / / / |/| | | | |
* | | | | | Move git operations for multi_action into Gitlab::GitAlejandro Rodríguez2018-01-052-0/+48
| |_|_|_|/ |/| | | |
* | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-7/+68
| |_|_|/ |/| | |
* | | | Merge branch 'ban-disk-import' into 'master'Sean McGivern2018-01-053-1/+10
|\ \ \ \
| * | | | rubocopban-disk-importJacob Vosmaer2018-01-041-1/+1
| * | | | Hide hooks stuffJacob Vosmaer2018-01-042-3/+2
| * | | | get it workingJacob Vosmaer2018-01-043-1/+11
| | |_|/ | |/| |
* | | | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-051-0/+61
* | | | Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-051-6/+25
|\ \ \ \
| * | | | Fix typos in a code commentZeger-Jan van de Weg2018-01-051-2/+2
| * | | | Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-021-6/+25
* | | | | Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master'Sean McGivern2018-01-052-1/+13
|\ \ \ \ \
| * | | | | Prepare Gitlab::Git::Repository#rebase for Gitaly migrationfix/prepare-rebase-to-be-migrated-to-gitalyAhmad Sherif2018-01-042-1/+13
* | | | | | Merge branch 'gitaly-annotations-20180104' into 'master'Sean McGivern2018-01-051-9/+4
|\ \ \ \ \ \
| * | | | | | Update some Gitaly annotations in Gitlab::Shellgitaly-annotations-20180104Jacob Vosmaer2018-01-041-9/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ldap_username_attributes' into 'master'Douwe Maan2018-01-053-8/+32
|\ \ \ \ \ \
| * | | | | | Modify `LDAP::Person` to return username value based on attributesDrew Blessing2018-01-043-8/+32
* | | | | | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-042-11/+17
* | | | | | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-041-8/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-8/+23
* | | | | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-043-42/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | Move git operations for UpdateRemoteMirrorService into Gitlab::Gitce-gitaly-remote-mirror-prepAlejandro Rodríguez2018-01-031-0/+75
| * | | | | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-20/+12
| * | | | | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-22/+18
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-041-34/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-031-34/+2
* | | | | | | | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-041-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-8/+8
| |/ / / / / /
* | | | | | | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-041-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix method lookupJacob Vosmaer2018-01-031-1/+3
View Lorry Controller Status