summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-101-1/+1
* Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-102-3/+9
* Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-092-6/+14
* Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-092-17/+47
* Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-092-5/+45
* Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-092-4/+15
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-092-2/+2
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-0979-1071/+2486
* Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-091-5/+1
* Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-082-16/+19
|\
| * Remove EE-specific group pathsbvl-free-pathsBob Van Landuyt2017-11-071-7/+0
| * Check redirecting with a querystringBob Van Landuyt2017-11-071-2/+4
| * Free up some group reserved wordsBob Van Landuyt2017-11-072-6/+9
| * Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-071-3/+0
| * Free up `labels` as a group nameBob Van Landuyt2017-11-071-1/+0
| * Add helper methods to redirect legacy pathsBob Van Landuyt2017-11-071-0/+9
* | Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'ma...Stan Hu2017-11-081-2/+0
|\ \
| * | Make BackgroundTransaction#labels publicPawel Chojnacki2017-11-071-2/+0
* | | Improve GitLab Import rake task to work with Hashed Storage and SubgroupsJames Lopez2017-11-074-105/+149
| |/ |/|
* | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-081-1/+1
|\ \
| * | Review Gitlab::Kubernetes::NamespaceAlessio Caiazza2017-11-071-1/+1
* | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-084-30/+43
|\ \ \ | |/ / |/| / | |/
| * Merge branch '39903-restore-backup-warning' into 'master'Douwe Maan2017-11-071-17/+22
| |\
| | * show better message when deciding not to continue39903-restore-backup-warningdigitalMoksha2017-11-071-17/+22
| | * Make warning message more explicitdigitalMoksha2017-11-071-1/+1
| * | Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-071-1/+1
| |\ \
| | * | fix specsfix/import-export-argumentsJames Lopez2017-11-071-1/+1
| | * | Fix arguments error on Import/Export fetch_ref methodJames Lopez2017-11-071-1/+1
| | |/
| * | Merge branch '39831-warning-icon-in-jobs-dropdown-has-incorrect-style' into '...Clement Ho2017-11-071-1/+1
| |\ \
| | * | Fixed Status Warning Icon39831-warning-icon-in-jobs-dropdown-has-incorrect-styleTim Zallmann2017-11-061-1/+1