summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-153-23/+58
* Fixing request json mime typeFrancisco Javier LĂłpez2018-01-151-3/+1
* Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-151-0/+36
|\
| * Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-0/+36
* | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-153-34/+53
|\ \ | |/ |/|
| * Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-113-34/+53
* | Introduce PredicateMemoization cop and fix offensesLin Jen-Shin2018-01-126-10/+38
* | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-112-1/+24
|\ \
| * | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-102-1/+24
* | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-112-22/+76
|\ \ \
| * | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-102-22/+76
| |/ /
* | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1126-0/+40
* | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-113-3/+0
|\ \ \
| * | | Remove soft removals related codeYorick Peterse2018-01-083-3/+0
* | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'RĂ©my Coutable2018-01-112-17/+47
|\ \ \ \
| * | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-112-17/+47
| | |/ / | |/| |
* | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-111-0/+7
|\ \ \ \
| * | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+7
* | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-111-0/+26
|\ \ \ \ \
| * | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-101-0/+26
| |/ / / /
* | | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-101-2/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" CarlbÀcker2018-01-091-2/+15
* | | | | Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master'Douwe Maan2018-01-102-34/+18
|\ \ \ \ \
| * | | | | Migrate GitlabProject (re)move project endpointsZeger-Jan van de Weg2018-01-092-34/+18
* | | | | | Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master'Sean McGivern2018-01-101-3/+5
|\ \ \ \ \ \
| * | | | | | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmapAhmad Sherif2018-01-091-3/+5
| | |_|/ / / | |/| | | |
* | | | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-0/+1
|/ / / / /
* | | | | 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
| |_|_|/ |/| | |