summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove from main.js38869-mrFilipa Lacerda2017-11-071-2/+0
* Merge branch 'master' into 38869-mrFilipa Lacerda2017-11-0714-23/+325
|\
| * Merge branch 'add-ingress-to-cluster-applications' into 'master'Kamil Trzciński2017-11-0714-23/+325
| |\
| | * Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl...Kamil Trzcinski2017-11-077-26/+12
| | |\
| | * | Fix db/schema.rbKamil Trzcinski2017-11-071-2/+1
| | * | Add feature spec for IngressEric Eastwood2017-11-071-16/+60
| | * | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-0768-442/+766
| | |\ \
| | * \ \ Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-071-3/+2
| | |\ \ \
| | * | | | Make ingress to use install_commandKamil Trzcinski2017-11-072-2/+22
| | * | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus...Kamil Trzcinski2017-11-0712-45/+208
| | |\ \ \ \
| | * | | | | Fix ingress rubocop failureKamil Trzcinski2017-11-071-1/+1
| | * | | | | Add specs for ingressKamil Trzcinski2017-11-073-0/+148
| | * | | | | Fix ingress.rbKamil Trzcinski2017-11-071-0/+2
| | * | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0795-221/+815
| | |\ \ \ \ \
| | * | | | | | Fix initial status againKamil Trzcinski2017-11-073-13/+9
| | * | | | | | Fix initial_statusKamil Trzcinski2017-11-071-4/+6
| | * | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0729-209/+157
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-06237-2946/+8139
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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 gitlab.com:gitlab-org/g...Eric Eastwood2017-11-061-1/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-t...add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-10/+20
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '36629-35958-add-cluster-application-section' into add-ingress-t...Eric Eastwood2017-11-067-34/+115
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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 add-ingress-t...Kamil Trzcinski2017-11-061-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix ingress endpointKamil Trzcinski2017-11-061-1/+1
| | * | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into add-ingress-t...Kamil Trzcinski2017-11-062-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | 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 add-ingress-t...Kamil Trzcinski2017-11-06255-1435/+2340
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add Ingress to cluster applications sectionEric Eastwood2017-11-033-3/+12
* | | | | | | | | | | | | | | | | Remove merge request code from window object and enable eslintFilipa Lacerda2017-11-076-882/+850
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '10.2-templates-vendoring' into 'master'Kamil Trzciński2017-11-078-20/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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 SubgroupsJames Lopez2017-11-079-227/+398
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'fix-comments-spec' into 'master'Rémy Coutable2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix merge_request_specAnnabel Dunstone Gray2017-11-071-1/+1
* | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0763-237/+2546
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-082-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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 spec/serial...Shinya Maeda2017-11-082-3/+3
| * | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-089-42/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \