Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 2 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add changelog for Ingress in Cluster applications | Eric Eastwood | 2017-11-06 | 1 | -0/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'add-ingress-to-cluster-applications' of ↵ | Eric Eastwood | 2017-11-06 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into add-ingress-to-cluster-applications | |||||
| | * | | | | | | | | | | | Fix db/schema.rb | Kamil Trzcinski | 2017-11-06 | 1 | -1/+10 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove misspelled duplicate endpoint | Eric Eastwood | 2017-11-06 | 1 | -1/+0 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 56 | -374/+668 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '36629-35958-add-cluster-application-section' into ↵add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 2 | -10/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '36629-35958-add-cluster-application-section' into ↵ | Eric Eastwood | 2017-11-06 | 7 | -34/+115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications Conflicts: app/assets/javascripts/clusters/clusters_bundle.js app/assets/javascripts/clusters/components/application_row.vue app/assets/javascripts/clusters/services/clusters_service.js | |||||
| * | | | | | | | | | | | | | | Add active? to Platforms::Kubernetes | Kamil Trzcinski | 2017-11-06 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add support for not_installable/scheduled and to not show created banner | Kamil Trzcinski | 2017-11-06 | 7 | -5/+27 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵ | Kamil Trzcinski | 2017-11-06 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | |||||
| * | | | | | | | | | | | | | | | Fix ingress endpoint | Kamil Trzcinski | 2017-11-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵ | Kamil Trzcinski | 2017-11-06 | 2 | -3/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | |||||
| * | | | | | | | | | | | | | | | | Set installation paths | Kamil Trzcinski | 2017-11-06 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add ingress application | Kamil Trzcinski | 2017-11-06 | 4 | -13/+72 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵ | Kamil Trzcinski | 2017-11-06 | 255 | -1435/+2340 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | |||||
| * | | | | | | | | | | | | | | | | | Add Ingress to cluster applications section | Eric Eastwood | 2017-11-03 | 3 | -3/+12 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch '10.2-templates-vendoring' into 'master' | Kamil Trzciński | 2017-11-07 | 8 | -20/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade vendored templates for 10.2 See merge request gitlab-org/gitlab-ce!15259 | |||||
| * | | | | | | | | | | | | | | | | | | Upgrade vendored templates | Alessio Caiazza | 2017-11-07 | 8 | -20/+107 | |
| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'feature/hashed-storage-repo-import' into 'master' | Nick Thomas | 2017-11-07 | 9 | -227/+398 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab Import rake task to work with Hashed Storage and Subgroups Closes #36509 See merge request gitlab-org/gitlab-ce!15157 | |||||
| * | | | | | | | | | | | | | | | | | | Improve GitLab Import rake task to work with Hashed Storage and Subgroups | James Lopez | 2017-11-07 | 9 | -227/+398 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-comments-spec' into 'master' | Rémy Coutable | 2017-11-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge_request_spec See merge request gitlab-org/gitlab-ce!15250 | |||||
| * | | | | | | | | | | | | | | | | | Fix merge_request_spec | Annabel Dunstone Gray | 2017-11-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' into 'master' | Kamil Trzciński | 2017-11-07 | 63 | -237/+2546 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908 | |||||
| * | | | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-08 | 2 | -4/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps | |||||
| | * | | | | | | | | | | | | | | | | | Review Gitlab::Kubernetes::Namespace | Alessio Caiazza | 2017-11-07 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix Projects::Clusters::ApplicationsController failures | Alessio Caiazza | 2017-11-07 | 1 | -3/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fix schema version | Shinya Maeda | 2017-11-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-08 | 66 | -440/+764 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fix spec. spec/serializers/cluster_application_entity_spec.rb and ↵ | Shinya Maeda | 2017-11-08 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/serializers/cluster_entity_spec.rb | |||||
| * | | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-08 | 9 | -42/+163 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps | |||||
| | * | | | | | | | | | | | | | | | | Fix rubocop warning | Alessio Caiazza | 2017-11-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Add Helm InstallCommand | Alessio Caiazza | 2017-11-07 | 8 | -41/+162 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add feature spec for app installation | Shinya Maeda | 2017-11-08 | 1 | -0/+42 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Fix tests for initial status | Kamil Trzcinski | 2017-11-07 | 3 | -2/+20 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix initial status again | Kamil Trzcinski | 2017-11-07 | 2 | -7/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Do not use RSpec.describe | Alessio Caiazza | 2017-11-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Do not use %i() in state machines | Alessio Caiazza | 2017-11-07 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add k8s namespace implementation and tests | Alessio Caiazza | 2017-11-07 | 3 | -25/+101 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-07 | 7 | -38/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps | |||||
| | * | | | | | | | | | | | | | | Rework initial state | Kamil Trzcinski | 2017-11-07 | 2 | -5/+7 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Use flash for dismissable alerts | Eric Eastwood | 2017-11-07 | 3 | -30/+9 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Update Cluster application install to be enabled when errored | Eric Eastwood | 2017-11-07 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix wildcard route and use param style | Shinya Maeda | 2017-11-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-07 | 5 | -29/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps | |||||
| | * | | | | | | | | | | | | | | Fix cluster_applications_helm factory with a configured cluster | Alessio Caiazza | 2017-11-07 | 2 | -9/+10 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Remove Project#clusters export | Alessio Caiazza | 2017-11-07 | 3 | -20/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 88 | -189/+689 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Revert "Fix cluster_applications_helm factory as cluster always has been ↵ | Shinya Maeda | 2017-11-07 | 1 | -6/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cerated" This reverts commit 36d69130a2337458a2fec94665d9369feb7a2f02. | |||||
| * | | | | | | | | | | | | | | | Fix cluster_applications_helm factory as cluster always has been cerated | Shinya Maeda | 2017-11-07 | 1 | -11/+6 | |
| | | | | | | | | | | | | | | | |