summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1734-220/+564
|\
| * Merge branch 'cache-user-keys-count' into 'master'Douwe Maan2017-11-166-27/+65
| |\
| | * Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-166-27/+65
| * | 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-153-9/+15
| * | 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-151-11/+11
| |\ \ | | |/ | |/|
| | * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-151-11/+11
| * | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-131-3/+5
| |/
| * Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-112-1/+9
| * Prevent fast forward merge when rebase is requiredissue_39773_beFelipe Artur2017-11-101-11/+16
| * Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-11/+1
| |\
| | * Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-081-11/+1
| * | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-081-1/+17
| |\ \
| | * | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-071-4/+4
| | * | Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-1/+17
| * | | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-081-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-071-1/+1
| | |/
| * | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-081-0/+39
| |\ \ | | |/
| | * Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-071-0/+39
| | |\
| | | * Extract ensure stage service from commit status classGrzegorz Bizon2017-11-061-0/+39
| * | | Add Helm InstallCommandAlessio Caiazza2017-11-073-4/+8
| * | | Remove Clusters::Applications::FinalizeInstallationServiceAlessio Caiazza2017-11-072-18/+23
| * | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-065-22/+63
| |\ \ \ | | |/ /
| | * | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0612-149/+203
| | |\ \
| | * | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-063-0/+49
| * | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-061-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-1/+1
| | |\ \ \
| * | | | | Add Clusters::Applications services testsAlessio Caiazza2017-11-064-31/+10
| * | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-062-19/+45
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-052-19/+45
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Add Clusters::Appplications::CheckInstallationProgressService testsAlessio Caiazza2017-11-061-2/+2
| * | | | | Fix typosAlessio Caiazza2017-11-031-1/+1
| * | | | | Schedule k8s application installation with a serviceAlessio Caiazza2017-11-031-0/+27
| * | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-032-10/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' into refactor-clustersEric Eastwood2017-11-032-0/+14
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-036-97/+101
| | |\ \ \ \ \
| | * | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-022-10/+5
| | * | | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i...Shinya Maeda2017-11-021-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-022-0/+25
| | |\ \ \ \ \ \ \
| * | | | | | | | | Remove `Clusters::Applications::FetchInstallationStatusService`Alessio Caiazza2017-11-033-35/+46
| * | | | | | | | | Rename App to ApplicationsAlessio Caiazza2017-11-0310-101/+111
| * | | | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-032-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-038-97/+126
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Fix nitpicksKamil Trzcinski2017-11-031-1/+1
| * | | | | | | | | Extract ClusterWaitForAppInstallationWorker logic into a serviceAlessio Caiazza2017-11-022-1/+29
| * | | | | | | | | General cleanupAlessio Caiazza2017-11-023-26/+1
| * | | | | | | | | Improve backend structure of dataKamil Trzcinski2017-11-024-8/+14
| * | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-0226-219/+304
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-012-22/+85
| | * | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-011-16/+3