summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelog for Ingress in Cluster applicationsEric Eastwood2017-11-061-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'add-ingress-to-cluster-applications' of ↵Eric Eastwood2017-11-061-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into add-ingress-to-cluster-applications
| | * | | | | | | | | | | Fix db/schema.rbKamil Trzcinski2017-11-061-1/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove misspelled duplicate endpointEric Eastwood2017-11-061-1/+0
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-0656-374/+668
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '36629-35958-add-cluster-application-section' into ↵add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-10/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '36629-35958-add-cluster-application-section' into ↵Eric Eastwood2017-11-067-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::KubernetesKamil Trzcinski2017-11-061-0/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-067-5/+27
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * | | | | | | | | | | | | | | Fix ingress endpointKamil Trzcinski2017-11-061-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-062-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * | | | | | | | | | | | | | | | Set installation pathsKamil Trzcinski2017-11-061-3/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add ingress applicationKamil Trzcinski2017-11-064-13/+72
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into ↵Kamil Trzcinski2017-11-06255-1435/+2340
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * | | | | | | | | | | | | | | | | Add Ingress to cluster applications sectionEric Eastwood2017-11-033-3/+12
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '10.2-templates-vendoring' into 'master'Kamil Trzciński2017-11-078-20/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade vendored templates for 10.2 See merge request gitlab-org/gitlab-ce!15259
| * | | | | | | | | | | | | | | | | | Upgrade vendored templatesAlessio Caiazza2017-11-078-20/+107
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'feature/hashed-storage-repo-import' into 'master'Nick Thomas2017-11-079-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 SubgroupsJames Lopez2017-11-079-227/+398
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'fix-comments-spec' into 'master'Rémy Coutable2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge_request_spec See merge request gitlab-org/gitlab-ce!15250
| * | | | | | | | | | | | | | | | | Fix merge_request_specAnnabel Dunstone Gray2017-11-071-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0763-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 Maeda2017-11-082-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps
| | * | | | | | | | | | | | | | | | | Review Gitlab::Kubernetes::NamespaceAlessio Caiazza2017-11-071-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix Projects::Clusters::ApplicationsController failuresAlessio Caiazza2017-11-071-3/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix schema versionShinya Maeda2017-11-081-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0866-440/+764
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix spec. spec/serializers/cluster_application_entity_spec.rb and ↵Shinya Maeda2017-11-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/serializers/cluster_entity_spec.rb
| * | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda2017-11-089-42/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps
| | * | | | | | | | | | | | | | | | Fix rubocop warningAlessio Caiazza2017-11-071-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add Helm InstallCommandAlessio Caiazza2017-11-078-41/+162
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add feature spec for app installationShinya Maeda2017-11-081-0/+42
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fix tests for initial statusKamil Trzcinski2017-11-073-2/+20
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix initial status againKamil Trzcinski2017-11-072-7/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Do not use RSpec.describeAlessio Caiazza2017-11-071-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Do not use %i() in state machinesAlessio Caiazza2017-11-071-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add k8s namespace implementation and testsAlessio Caiazza2017-11-073-25/+101
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda2017-11-077-38/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps
| | * | | | | | | | | | | | | | Rework initial stateKamil Trzcinski2017-11-072-5/+7
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Use flash for dismissable alertsEric Eastwood2017-11-073-30/+9
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update Cluster application install to be enabled when erroredEric Eastwood2017-11-072-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix wildcard route and use param styleShinya Maeda2017-11-071-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda2017-11-075-29/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 38464-k8s-apps
| | * | | | | | | | | | | | | | Fix cluster_applications_helm factory with a configured clusterAlessio Caiazza2017-11-072-9/+10
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove Project#clusters exportAlessio Caiazza2017-11-073-20/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0788-189/+689
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "Fix cluster_applications_helm factory as cluster always has been ↵Shinya Maeda2017-11-071-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cerated" This reverts commit 36d69130a2337458a2fec94665d9369feb7a2f02.
| * | | | | | | | | | | | | | | Fix cluster_applications_helm factory as cluster always has been ceratedShinya Maeda2017-11-071-11/+6
| | | | | | | | | | | | | | | |