summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Introduce PredicateMemoization cop and fix offensesLin Jen-Shin2018-01-126-10/+38
* Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-121-4/+11
|\
| * Ensure that emails contain absolute, rather than relative, links to user uploadsNick Thomas2018-01-111-4/+11
* | 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-1151-0/+73
* | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-115-5/+2
|\ \ \
| * | | Remove soft removals related codeYorick Peterse2018-01-085-5/+2
* | | | 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 '39214__pipeline_api' into 'master'Sean McGivern2018-01-111-0/+16
|\ \ \ \
| * | | | Fix styleTony Rom2018-01-101-2/+3
| * | | | Add `pipelines` endpoint to merge requests APITony Rom2017-12-151-0/+15
* | | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-111-3/+3
|\ \ \ \ \
| * | | | | Add missing user agent header to GCP clientMatija Čupić2018-01-111-2/+2
| * | | | | Fix billing checkingKamil Trzciński2018-01-101-2/+2
| | |_|/ / | |/| | |
* | | | | 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 'da-verify-integrity-of-uploaded-files' into 'master'Robert Speicher2018-01-101-0/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix small typosDouglas Barbosa Alexandre2018-01-091-1/+1
| * | | | | Add rake task to check integrity of uploaded filesDouglas Barbosa Alexandre2018-01-081-0/+44
| |/ / / /
* | | | | 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
|/ / / / /
* | | | | Add option to disable commit stats to commit APIFrancisco Javier López2018-01-093-3/+5
* | | | | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-093-2/+103
|\ \ \ \ \
| * | | | | 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-082-0/+35
* | | | | | 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-083-1/+27
| |_|/ / / / |/| | | | |
* | | | | | 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 '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but...Kamil Trzciński2018-01-071-0/+18
|\ \ \ \ \ \ \
View Lorry Controller Status