summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-226-16/+8
* Updates based on feedbackLin Jen-Shin2017-11-221-3/+3
* Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1815-50/+52
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-17116-720/+3902
|\
| * Convert migration to populate latest merge request ID into a background migra...Stan Hu2017-11-171-0/+30
| * Merge branch 'fix/add-attributes-bag-class-to-gitaly-client' into 'master'Sean McGivern2017-11-165-32/+39
| |\
| | * Add an attributes bag class as a GitalyClient helperfix/add-attributes-bag-class-to-gitaly-clientAhmad Sherif2017-11-155-32/+39
| * | Update container repository path referenceGrzegorz Bizon2017-11-161-1/+1
| * | Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-ti...Douwe Maan2017-11-152-0/+2
| |\ \ | | |/ | |/|
| | * Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-152-0/+2
| * | Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
| |/
| * Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-152-0/+8
| |\
| | * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-0/+8
| * | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-141-1/+11
| |\ \
| | * | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-141-1/+11
| | |/
| * | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-141-1/+4
| |\ \
| | * | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-091-1/+4
| * | | Merge branch 'gitaly-wiki-get-all-pages' into 'master'Rémy Coutable2017-11-143-18/+62
| |\ \ \
| | * | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-133-18/+62
| * | | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-131-0/+31
| | |_|/ | |/| |
| * | | 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
| | | |/ / | | |/| |
| * | | | 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-091-0/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Support importing GH projects without rate limitsgithub-rake-task-rate-limitingYorick Peterse2017-11-081-0/+6
| | |/ /
| * | | 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-081-0/+8
| |\ \
| | * | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-071-0/+8
| * | | Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-081-3/+29
| |\ \ \
| | * | | 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 'github-importer-refactor' into 'master'Douwe Maan2017-11-0854-121/+2469
| |\ \ \ \
| | * | | | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-071-1/+1
| | * | | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-0753-118/+2445
| | * | | | 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