summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | 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-073-97/+143
| |/ / / |/| | |
* | | | 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-083-13/+21
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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
| * | | | Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-071-11/+19
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix TRIGGER checks for MySQLfix-mysql-grant-checkYorick Peterse2017-11-061-11/+19
* | | | | Add Helm InstallCommandAlessio Caiazza2017-11-071-35/+42
* | | | | Add k8s namespace implementation and testsAlessio Caiazza2017-11-072-25/+35
* | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-072-4/+0
|\ \ \ \ \
| * | | | | Remove Project#clusters exportAlessio Caiazza2017-11-072-4/+0
* | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-072-1/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Support custom attributes on projectsMarkus Koller2017-11-062-1/+3
* | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0629-381/+763
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-063-18/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-0621-350/+684
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643Pawel Chojnacki2017-11-031-12/+21
| | * | | | Make subscriber tests pass, after refactoring metricsPawel Chojnacki2017-11-022-4/+4
View Lorry Controller Status