summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/fix-disabled-oauth-access' into 'security-10-2'Robert Speicher2018-01-092-5/+12
* Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-081-0/+4
* Merge branch 'fix/import-rce-10-2' into 'security-10-2'James Lopez2018-01-083-3/+19
* Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-2' into 'securit...Douwe Maan2018-01-083-33/+84
* Merge branch 'security-ac/fix-path-traversal-10-2' into 'security-10-2'Robert Speicher2018-01-081-1/+15
* Merge branch 'ac/41346-xss-ci-job-output-backport-10-2' into 'security-10-2'Robert Speicher2018-01-081-1/+1
* Merge branch 'security-10-2-do-not-expose-passwords-or-tokens-in-service-inte...Sean McGivern2018-01-084-10/+4
* Merge branch 'sh-optimize-groups-api-10-2' into '10-2-stable-patch-5'10-2-stable-patch-5Winnie Hellmann2017-12-144-42/+149
|\
| * Solved copy/paste error!Francisco Javier López2017-12-141-4/+5
| * Resolving conflictsh-optimize-groups-api-10-2Francisco Javier López2017-12-141-23/+5
| * Resolving conflictFrancisco Javier López2017-12-141-5/+6
| * Resolving conflictFrancisco Javier López2017-12-141-4/+1
| * Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-144-14/+128
| * Cherry pick lib/api/entities.rb from 763ea26dc6be7760e4084b57bcf56f32e3e9ef0aKamil Trzciński2017-12-141-7/+19
* | Merge branch 'bvl-fork-networks-for-deleted-projects-10-2' into '10-2-stable-...Winnie Hellmann2017-12-141-4/+73
|\ \
| * | Resolve conflicts in `populate_fork_networks_range.rb`Bob Van Landuyt2017-12-141-3/+0
| * | Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'Sean McGivern2017-12-141-4/+76
| |/
* | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-141-3/+3
|/
* Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-142-0/+3
* Merge branch '40711-fix-forking-hashed-projects' into 'master'Douwe Maan2017-12-141-8/+15
* Merge branch 'bvl-circuitbreaker-keys-set' into 'master'Douwe Maan2017-12-143-23/+17
* Merge branch '40615-specific-10-2-fix' into '10-2-stable'Winnie Hellmann2017-12-111-0/+2
|\
| * Merge branch 'sh-fix-root-ref-repository' into 'master'40615-specific-10-2-fixRémy Coutable2017-12-011-0/+2
* | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-061-0/+2
* | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-061-2/+15
|/
* Merge branch 'dm-project-search-performance' into 'master'Sean McGivern2017-11-281-1/+1
* Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master'Stan Hu2017-11-281-2/+5
* Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-281-15/+10
* Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-281-2/+1
* Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-281-1/+2
* Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-231-2/+2
* Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-232-3/+17
* Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-re...Sean McGivern2017-11-231-2/+2
* Merge branch 'pawel/disable_prometheus_metrics' into 'master'10-2-stable-patch-1Stan Hu2017-11-221-3/+3
* Resolve conflicts in lib/tasks/gitlab/cleanup.rake10-2-stable-prepare-finalWinnie Hellmann2017-11-211-4/+0
* Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'Stan Hu2017-11-211-0/+8
* Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-211-1/+7
* Mark all gitaly features as opt-inopt-in-gitalyAlejandro Rodríguez2017-11-211-1/+1
* Merge branch 'fix-conflict-highlighting' into 'master'10-2-stable-prepare-rc4Douwe Maan2017-11-201-0/+4
* Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-stora...Rémy Coutable2017-11-201-2/+2
* Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-201-1/+3
* Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan2017-11-172-1/+15
* Merge branch '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-...Douwe Maan2017-11-171-3/+3
* Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern2017-11-171-3/+2
* Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'Sean McGivern2017-11-171-0/+30
* Merge branch 'fix/gb/update-registry-path-reference-regexp' into 'master'Kamil Trzciński2017-11-161-1/+1
* Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu2017-11-151-8/+16
* Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-151-1/+11
* Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-151-1/+4
* Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ...Sean McGivern2017-11-141-2/+0