Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cache feature names in RequestStore | Yorick Peterse | 2017-11-07 | 2 | -1/+54 |
* | Add returning IDs to Gitlab::Database.bulk_insert | Yorick Peterse | 2017-11-07 | 2 | -2/+43 |
* | Refactor User.find_by_any_email | Yorick Peterse | 2017-11-07 | 2 | -9/+22 |
* | Merge branch 'add-ingress-to-cluster-applications' into 'master' | Kamil Trzciński | 2017-11-07 | 14 | -23/+325 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl... | Kamil Trzcinski | 2017-11-07 | 7 | -26/+12 |
| |\ | |||||
| * | | Fix db/schema.rb | Kamil Trzcinski | 2017-11-07 | 1 | -2/+1 |
| * | | Add feature spec for Ingress | Eric Eastwood | 2017-11-07 | 1 | -16/+60 |
| * | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Kamil Trzcinski | 2017-11-07 | 68 | -442/+766 |
| |\ \ | |||||
| * \ \ | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Kamil Trzcinski | 2017-11-07 | 1 | -3/+2 |
| |\ \ \ | |||||
| * | | | | Make ingress to use install_command | Kamil Trzcinski | 2017-11-07 | 2 | -2/+22 |
| * | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus... | Kamil Trzcinski | 2017-11-07 | 12 | -45/+208 |
| |\ \ \ \ | |||||
| * | | | | | Fix ingress rubocop failure | Kamil Trzcinski | 2017-11-07 | 1 | -1/+1 |
| * | | | | | Add specs for ingress | Kamil Trzcinski | 2017-11-07 | 3 | -0/+148 |
| * | | | | | Fix ingress.rb | Kamil Trzcinski | 2017-11-07 | 1 | -0/+2 |
| * | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 95 | -221/+815 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix initial status again | Kamil Trzcinski | 2017-11-07 | 3 | -13/+9 |
| * | | | | | | Fix initial_status | Kamil Trzcinski | 2017-11-07 | 1 | -4/+6 |
| * | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 29 | -209/+157 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 237 | -2946/+8139 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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 gitlab.com:gitlab-org/g... | Eric Eastwood | 2017-11-06 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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-t...add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 2 | -10/+20 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '36629-35958-add-cluster-application-section' into add-ingress-t... | Eric Eastwood | 2017-11-06 | 7 | -34/+115 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 add-ingress-t... | Kamil Trzcinski | 2017-11-06 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix ingress endpoint | Kamil Trzcinski | 2017-11-06 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Merge branch '36629-35958-add-cluster-application-section' into add-ingress-t... | Kamil Trzcinski | 2017-11-06 | 2 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | 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 add-ingress-t... | Kamil Trzcinski | 2017-11-06 | 255 | -1435/+2340 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | 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 | 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 | 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 | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Shinya Maeda | 2017-11-08 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | 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 spec/serial... | Shinya Maeda | 2017-11-08 | 2 | -3/+3 |
| * | | | | | | | | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Shinya Maeda | 2017-11-08 | 9 | -42/+163 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |