summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-0/+8
* Merge branch 'zj-move-repo-exists-opt-out' into 'master'Sean McGivern2017-11-131-1/+1
|\
| * Repository Exists check is OPT_OUT for GitalyZeger-Jan van de Weg2017-11-091-1/+1
* | Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-103-29/+97
* | Merge branch 'cleanup-issues-schema' into 'master'Sean McGivern2017-11-101-1/+0
|\ \
| * | Clean up schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-091-1/+0
* | | Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-101-1/+1
|\ \ \
| * | | Icon Sprite URL is also local even if asset_host is setTim Zallmann2017-11-091-1/+1
| | |/ | |/|
* | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-091-22/+44
* | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'Rémy Coutable2017-11-091-0/+6
|\ \ \
| * | | Fix acceptance of username for Mattermost service update via APIMark Fletcher2017-11-081-0/+6
* | | | Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ...Sean McGivern2017-11-091-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "add metrics tagging to the sidekiq middleware"39958-updatemergerequestsworker-are-failing-on-metric-taggingmicael.bergeron2017-11-081-2/+0
| |/ /
* | | Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-092-3/+9
|\ \ \ | |_|/ |/| |
| * | Support importing GH projects without rate limitsgithub-rake-task-rate-limitingYorick Peterse2017-11-081-0/+6
| * | Restore GH enterprise support in the Rake taskYorick Peterse2017-11-081-3/+3
| |/
* | Merge branch '36099-api-responses-missing-x-content-type-options-header' into...Douwe Maan2017-11-081-1/+4
* | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-081-1/+3
|/
* Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-082-6/+14
|\
| * Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-072-6/+14
* | Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-082-17/+47
|\ \
| * | Fix the GH importer Rake taskgithub-enterprise-support-importerYorick Peterse2017-11-081-14/+18
| * | Restore Enterprise support in the GH importerYorick Peterse2017-11-081-3/+29
* | | Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-082-5/+45
|\ \ \ | |/ / |/| |
| * | Migrate GitLab::Git::Wiki.update_page to GitalyKim "BKC" Carlbäcker2017-11-082-5/+45
* | | Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-082-4/+15
* | | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-082-2/+2
|\ \ \
| * | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-082-2/+2
| | |/ | |/|
* | | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-0879-1071/+2486
|\ \ \
| * | | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-0725-950/+5
| * | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-0753-118/+2445
| * | | Cache feature names in RequestStoreYorick Peterse2017-11-071-1/+13
| * | | Add returning IDs to Gitlab::Database.bulk_insertYorick Peterse2017-11-071-2/+23
| | |/ | |/|
* | | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-5/+1
|\ \ \
| * | | Updates tests to reflect sign_out route changeJoe Marty2017-11-071-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