summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | 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
| * | | | 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-079-14/+28
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-073-11/+9
| |\ \ \ \
| | * | | | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| | * | | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-063-8/+9
| | | |/ / | | |/| |
| * | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-075-2/+14
| |\ \ \ \
| | * | | | Support custom attributes on groupsMarkus Koller2017-11-061-1/+8
| | * | | | Support custom attributes on projectsMarkus Koller2017-11-064-1/+6
| * | | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-071-0/+4
| |\ \ \ \ \
| | * | | | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-031-0/+4
| * | | | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestonesVitaliy @blackst0ne Klachkov2017-11-071-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0644-445/+855
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-064-19/+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
| | * | | | | Use Mutex to guard metrics creation in transaction. Switch action view to thr...Pawel Chojnacki2017-11-022-28/+49
View Lorry Controller Status