summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus...Kamil Trzcinski2017-11-0712-45/+208
|\
| * 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 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 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
| |\
| * | 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
| |\ \
| * \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0788-189/+689
| |\ \ \
| | * \ \ Merge branch '39648-fix-gke-wording' into 'master'Filipa Lacerda2017-11-073-4/+4
| | |\ \ \
| | | * | | Resolve "Fix GKE wording"Fabio Busatto2017-11-073-4/+4
| | |/ / /
| | * | | Merge branch '39791-when-reopening-an-issue-the-mattermost-notification-has-n...Rémy Coutable2017-11-073-1/+19
| | |\ \ \
| | | * | | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-063-1/+19
| | * | | | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-075-14/+17
| | |\ \ \ \
| | | * | | | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| | | * | | | Cache the root ref SHA in an instance variable in Repository#merged_to_root_ref?Rémy Coutable2017-11-061-3/+3
| | | * | | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-064-8/+14
| | * | | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-0733-15/+240
| | |\ \ \ \ \
| | | * | | | | Support custom attributes on groupsMarkus Koller2017-11-0613-4/+105
| | | * | | | | Support custom attributes on projectsMarkus Koller2017-11-0622-13/+137
| | * | | | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-075-13/+53
| | |\ \ \ \ \ \
| | | * | | | | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-035-13/+53
| | * | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-076-12/+41
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix spec35616-move-gke-form-1st-iterationShinya Maeda2017-11-071-2/+1
| | | * | | | | | | Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-06245-3135/+8101
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/move-kubernetes-from-service-to-clusters...Kamil Trzcinski2017-11-06977-10136/+15020
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-0619-91/+303
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-05242-1261/+1889
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fixed controller specShinya Maeda2017-11-041-1/+1
| | | | * | | | | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-046-11/+40
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Workaround today the failure in testsKamil Trzcinski2017-11-031-1/+2
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Fix page titleFilipa Lacerda2017-11-031-1/+1
| | | * | | | | | | | | | | Adds check for existing clusterFilipa Lacerda2017-11-031-5/+12
| | | * | | | | | | | | | | Fix static anlysysShinya Maeda2017-11-021-1/+1
| | | * | | | | | | | | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-015-7/+11
| | | * | | | | | | | | | | Fix paths to the first pageKamil Trzcinski2017-11-014-14/+11
| | | * | | | | | | | | | | Adds buttons to the first page.Filipa Lacerda2017-10-273-3/+24
| | * | | | | | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-0714-76/+163
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | appease lint2518-saved-configuration-for-issue-boardSimon Knox2017-11-071-3/+1
| | | * | | | | | | | | | | | unused propSimon Knox2017-11-061-7/+1