Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 12 | -149/+203 |
|\ | |||||
| * | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 2 | -19/+45 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into refactor-clusters | Eric Eastwood | 2017-11-03 | 2 | -0/+14 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 6 | -97/+101 |
| |\ \ \ \ | |||||
| * | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll... | Shinya Maeda | 2017-11-02 | 2 | -10/+5 |
| * | | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i... | Shinya Maeda | 2017-11-02 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Pass cluster_id | Kamil Trzcinski | 2017-11-01 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 2 | -0/+25 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Revert back FetchKubernetesTokenService | Kamil Trzcinski | 2017-11-01 | 2 | -22/+85 |
| * | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer... | Kamil Trzcinski | 2017-11-01 | 1 | -16/+3 |
| * | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 1 | -2/+10 |
| * | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 7 | -12/+87 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | specs for feature | Shinya Maeda | 2017-11-01 | 1 | -2/+1 |
| * | | | | | | | specs for controller. Improved validation | Shinya Maeda | 2017-10-31 | 1 | -4/+4 |
| * | | | | | | | specs for services. Improved details. | Shinya Maeda | 2017-10-30 | 1 | -2/+6 |
| * | | | | | | | This works | Shinya Maeda | 2017-10-23 | 5 | -62/+85 |
| * | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform | Kamil Trzcinski | 2017-10-23 | 12 | -210/+185 |
* | | | | | | | | Resolve "DashboardController#activity.json is slow due to SQL" | Francisco Javier López | 2017-11-06 | 3 | -0/+49 |
* | | | | | | | | Merge branch 'jk-delete-epic-backport' into 'master' | Sean McGivern | 2017-11-06 | 2 | -22/+14 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Refactor issuable destroy action | Jarka Kadlecova | 2017-11-06 | 2 | -22/+14 |
* | | | | | | | | Merge branch 'ce-gitlab-git-backport' into 'master' | Sean McGivern | 2017-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Encapsulate git operations for mirroring in Gitlab::Git | Alejandro Rodríguez | 2017-11-03 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bvl-unlink-fixes' into 'master' | Douwe Maan | 2017-11-03 | 1 | -5/+11 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Unlink a project from a fork network when it's source was deleted. | Bob Van Landuyt | 2017-11-03 | 1 | -5/+11 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Add system hooks user_rename and group_rename | Winnie Hellmann | 2017-11-03 | 1 | -14/+34 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'refactor-services-for-audit-events-ce' into 'master' | Grzegorz Bizon | 2017-11-03 | 2 | -0/+14 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | refactor code | James Lopez | 2017-10-31 | 1 | -1/+1 |
| * | | | | fix specs | James Lopez | 2017-10-31 | 1 | -0/+0 |
| * | | | | fix spec | James Lopez | 2017-10-31 | 1 | -2/+0 |
| * | | | | uypdated keys controller logic | James Lopez | 2017-10-31 | 1 | -0/+1 |
| * | | | | add applications controller logic | James Lopez | 2017-10-31 | 1 | -0/+15 |
* | | | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master' | Stan Hu | 2017-11-02 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730 | Pawel Chojnacki | 2017-11-02 | 1 | -2/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add sudo API scope | Douwe Maan | 2017-11-02 | 1 | -5/+2 |
| |/ / / / | |||||
* | | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 4 | -90/+98 |
|/ / / / | |||||
* | | | | Refactor/group links controller | Francisco Javier López | 2017-11-01 | 2 | -0/+25 |
| |_|/ |/| | | |||||
* | | | Allow promoting project milestones to group milestones | Felipe Artur | 2017-10-31 | 1 | -0/+80 |
* | | | Merge branch '3674-hashed-storage-attachments' into 'master' | Douwe Maan | 2017-10-31 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Make `#hashed_storage?` require feature argument3674-hashed-storage-attachments | Gabriel Mazetto | 2017-10-31 | 1 | -1/+1 |
* | | | Refresh open Issue and Merge Request project counter caches when re-opening | Rob Ede | 2017-10-30 | 2 | -0/+2 |
* | | | Merge branch 'make-merge-jid-handling-less-stateful' into 'master' | Sean McGivern | 2017-10-30 | 1 | -8/+1 |
|\ \ \ | |||||
| * | | | Make merge_jid handling less stateful in MergeService | Oswaldo Ferreira | 2017-10-27 | 1 | -8/+1 |
| |/ / | |||||
* | | | Use the correct project visibility in system hooks | Bob Van Landuyt | 2017-10-30 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master' | Douwe Maan | 2017-10-23 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forks | Bob Van Landuyt | 2017-10-22 | 1 | -2/+2 |
* | | Use wiki.disk_path | Nick Thomas | 2017-10-18 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into sh-security-fix-backports-master | Stan Hu | 2017-10-17 | 1 | -1/+1 |
|\ | |||||
| * | Fix errors when deleting a forked project | Bob Van Landuyt | 2017-10-17 | 1 | -1/+1 |