summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0612-149/+203
|\
| * Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-1/+1
| |\
| * \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-052-19/+45
| |\ \
| * \ \ 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
| |\ \ \ \ \
| | * | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-022-0/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-012-22/+85
| * | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-011-16/+3
| * | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-011-2/+10
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-017-12/+87
| |\ \ \ \ \ \
| * | | | | | | specs for featureShinya Maeda2017-11-011-2/+1
| * | | | | | | specs for controller. Improved validationShinya Maeda2017-10-311-4/+4
| * | | | | | | specs for services. Improved details.Shinya Maeda2017-10-301-2/+6
| * | | | | | | This worksShinya Maeda2017-10-235-62/+85
| * | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-2312-210/+185
* | | | | | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-063-0/+49
* | | | | | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-062-22/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Refactor issuable destroy actionJarka Kadlecova2017-11-062-22/+14
* | | | | | | | Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-061-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-5/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Unlink a project from a fork network when it's source was deleted.Bob Van Landuyt2017-11-031-5/+11
| | |_|_|/ / | |/| | | |
* | | | | | Add system hooks user_rename and group_renameWinnie Hellmann2017-11-031-14/+34
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-032-0/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | refactor codeJames Lopez2017-10-311-1/+1
| * | | | fix specsJames Lopez2017-10-311-0/+0
| * | | | fix specJames Lopez2017-10-311-2/+0
| * | | | uypdated keys controller logicJames Lopez2017-10-311-0/+1
| * | | | add applications controller logicJames Lopez2017-10-311-0/+15
* | | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-021-2/+1
|\ \ \ \ \
| * | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-021-2/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-021-5/+2
|\ \ \ \ \
| * | | | | Add sudo API scopeDouwe Maan2017-11-021-5/+2
| |/ / / /
* | | | | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-024-90/+98
|/ / / /
* | | | Refactor/group links controllerFrancisco Javier López2017-11-012-0/+25
| |_|/ |/| |
* | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+80
* | | Merge branch '3674-hashed-storage-attachments' into 'master'Douwe Maan2017-10-311-1/+1
|\ \ \ | |/ / |/| |
| * | Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-311-1/+1
* | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-302-0/+2
* | | Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-301-8/+1
|\ \ \
| * | | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-8/+1
| |/ /
* | | Use the correct project visibility in system hooksBob Van Landuyt2017-10-301-1/+1
|/ /
* | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-231-2/+2
|\ \ | |/ |/|
| * Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-221-2/+2
* | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
|/
* Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-171-1/+1
|\
| * Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-1/+1