summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes admin welcome states new group pathadmin-welcome-new-group-linkPhil Hughes2017-12-063-1/+21
* Merge branch 'ee-backport-issue_40654' into 'master'Sean McGivern2017-12-062-4/+12
|\
| * [CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654Felipe Artur2017-12-052-4/+12
* | Merge branch 'downgrade-grpc-to-1.4.5' into 'master'Sean McGivern2017-12-061-5/+2
|\ \
| * | Downgrade the grpc gem to 1.4.5downgrade-grpc-to-1.4.5Jacob Vosmaer2017-12-051-5/+2
* | | Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-061-0/+10
|\ \ \
| * | | backport board scope highlightbackport-board-scope-highlightClement Ho2017-12-051-0/+10
* | | | Merge branch '38869-templates' into 'master'Phil Hughes2017-12-069-296/+278
|\ \ \ \
| * | | | Export template selector as ES6 modulesFilipa Lacerda2017-12-069-296/+278
|/ / / /
* | | | Merge branch '40543-generalize-detail-page-headers' into 'master'Phil Hughes2017-12-069-79/+66
|\ \ \ \
| * | | | Generalize detail page headers40543-generalize-detail-page-headersEric Eastwood2017-12-059-79/+66
* | | | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-0644-231/+1485
|\ \ \ \ \
| * | | | | Remove redundant empty line in CreateService specMatija Čupić2017-12-061-1/+0
| * | | | | Fix gcp|user_controller_specsKamil Trzcinski2017-12-062-4/+6
| * | | | | Refactor Clusters::CreateService specMatija Čupić2017-12-061-58/+62
| * | | | | Remove Add Cluster button from clusters/indexMatija Čupić2017-12-052-6/+0
| * | | | | Update externalized strings potMatija Čupić2017-12-051-22/+158
| * | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-05188-670/+1546
| |\ \ \ \ \
| * | | | | | Remove trailing whitespace from Clusters specMatija Čupić2017-12-051-13/+13
| * | | | | | Move can_toggle_cluster? from helper to presenterMatija Čupić2017-12-056-53/+47
| * | | | | | Mock Kaminari paginates_per instead of setting itMatija Čupić2017-12-051-1/+1
| * | | | | | Use ClustersFinder for setting countsMatija Čupić2017-12-052-9/+7
| * | | | | | Fix overwritten project.cluster replacementMatija Čupić2017-12-051-1/+1
| * | | | | | Fix empty state partial checkMatija Čupić2017-12-051-1/+1
| * | | | | | Fix rpsec all matchers in ClustersController specsMatija Čupić2017-12-051-2/+2
| * | | | | | Test for empty state partial instead of index viewMatija Čupić2017-12-051-1/+1
| * | | | | | Remove redundant view_clusters assignmentMatija Čupić2017-12-051-4/+2
| * | | | | | Replace Exception with ArgumentErrorMatija Čupić2017-12-051-1/+1
| * | | | | | Remove redundant return in Clusters::CreateServiceMatija Čupić2017-12-051-1/+1
| * | | | | | Revert node_modulesKamil Trzcinski2017-12-051-1/+0
| * | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-0529-70/+347
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-058-9/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Remove references of project.cluster from specsMatija Čupić2017-12-043-5/+5
| | * | | | | | | Remove cluster from Project modelMatija Čupić2017-12-042-2/+1
| | * | | | | | | Fix navbar CSSFilipa Lacerda2017-12-044-9/+14
| | * | | | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-04383-3368/+8601
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use actual namespaceKamil Trzcinski2017-12-031-1/+1
| | * | | | | | | | Fix clusters active/inactive togglingKamil Trzcinski2017-12-031-2/+3
| * | | | | | | | | Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-05164-996/+4315
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 35616-move-k8-to-cluster-pageKamil Trzcinski2017-12-0529-164/+486
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Clean up clusters_controller_spec.rbShinya Maeda2017-12-051-27/+13
| | * | | | | | | | | | Add merge_request number in changelogShinya Maeda2017-12-051-1/+1
| | * | | | | | | | | | Fix typo secret-keyShinya Maeda2017-12-051-1/+1
| | * | | | | | | | | | Use find instead of find_by!Shinya Maeda2017-12-051-1/+1
| | * | | | | | | | | | Merge branch 'master' into 35616-move-k8-to-cluster-pageShinya Maeda2017-12-0516-114/+257
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 35616-move-k8-to-cluster-pageShinya Maeda2017-12-05109-676/+3525
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix spec/features/projects/clusters/user_spec.rbShinya Maeda2017-12-051-3/+5
| | * | | | | | | | | | | | Add changelogShinya Maeda2017-12-051-0/+5
| | * | | | | | | | | | | | Improve name validation for clusterShinya Maeda2017-12-041-5/+5
| | * | | | | | | | | | | | Remove duplicated validations on cluster_nameShinya Maeda2017-12-041-5/+0