summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update mr_widget_options_spec.jsfl-cleanup-testFilipa Lacerda2017-11-071-1/+0
* Cleanup testsFilipa Lacerda2017-11-071-22/+0
* 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
| |\ \ \
| | * | | 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 into...Shinya Maeda2017-11-077-38/+19
| |\ \ \
| | * | | 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 into...Shinya Maeda2017-11-075-29/+10
| |\ \ \ \ | | |/ / /
| | * | | 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 cera...Shinya Maeda2017-11-071-6/+11
| * | | | Fix cluster_applications_helm factory as cluster always has been ceratedShinya Maeda2017-11-071-11/+6
| * | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-077-25/+21
| |\ \ \ \
| | * | | | More restrictive state machine transitions in Clusters::ApplicationStatusAlessio Caiazza2017-11-071-7/+7
| | * | | | Rename application_helm factory to cluster_application_helmAlessio Caiazza2017-11-076-18/+14
| * | | | | Fix static analysys in app/models/clusters/applications/helm.rb:15Shinya Maeda2017-11-071-1/+1
| |/ / / /
| * | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-0746-297/+1696
| |\ \ \ \
| | * | | | Remove Clusters::Applications::FinalizeInstallationServiceAlessio Caiazza2017-11-074-54/+36
| | * | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-06237-2947/+8140
| | |\ \ \ \
| | * | | | | Fix comma dangle eslint in application_row.vueEric Eastwood2017-11-061-1/+1
| | * | | | | Update Cluster applications screenshot with updated descriptionEric Eastwood2017-11-061-0/+0
| | * | | | | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps'Kamil Trzciński2017-11-0626-209/+1374
| | |\ \ \ \ \
| | | * | | | | Fix small error [ci skip]Kamil Trzcinski2017-11-061-1/+1
| | | * | | | | I18n general app error and update attributes from reviewEric Eastwood2017-11-062-10/+20
| | | * | | | | Add FE tests for not_installable/scheduled and cluster banner rules36629-35958-add-cluster-application-sectionEric Eastwood2017-11-067-34/+117
| | | * | | | | Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| | | * | | | | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-066-5/+21
View Lorry Controller Status