summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-0336-512/+1378
|\
| * Raise error when trying to create second clusterMatija Čupić2017-12-032-2/+2
| * Refactor clusters feature spec unused variableMatija Čupić2017-12-031-5/+4
| * Add check for cluster change after toggleMatija Čupić2017-12-021-0/+2
| * Update toggle button text in show pageFilipa Lacerda2017-12-024-9/+351
| * Remove stray pry binding in specMatija Čupić2017-12-021-1/+0
| * Refactor ClustersController pagination testMatija Čupić2017-12-012-12/+11
| * Add can_toggle_cluster? helperMatija Čupić2017-12-013-1/+51
| * Add created? to Cluster modelMatija Čupić2017-12-012-0/+26
| * Add specs JSON PUT #delete for ClustersControllerMatija Čupić2017-12-011-18/+55
| * Refactor disabled cluster testing to use traitMatija Čupić2017-12-013-12/+14
| * Rename spec local variable to avoid shadowingMatija Čupić2017-12-011-8/+5
| * Refactor pagination check into separate contextMatija Čupić2017-12-011-7/+14
| * Remove redundant to_paramsMatija Čupić2017-12-011-3/+3
| * Use strings for @scope in ClustersController#indexMatija Čupić2017-11-302-2/+2
| * Fix Cluster index view @scope logicMatija Čupić2017-11-301-7/+7
| * Default to :all scope for ClustersController#indexMatija Čupić2017-11-291-1/+1
| * Fix show page toggleFilipa Lacerda2017-11-293-4/+4
| * Fix broken testsFilipa Lacerda2017-11-283-12/+23
| * Fix broken specsFilipa Lacerda2017-11-283-5/+4
| * Fix breadcrumbFilipa Lacerda2017-11-281-1/+2
| * Update ClustersController to match new scope logicMatija Čupić2017-11-281-3/+3
| * Move cluster sourcing from before_action to #indexMatija Čupić2017-11-281-8/+2
| * Use attr_reader instead of instance variablesMatija Čupić2017-11-281-4/+4
| * Expose scope to view in ClustersController#indexMatija Čupić2017-11-281-0/+1
| * Changes after Frontend and UX review:Filipa Lacerda2017-11-2814-158/+270
| * Refactor ClustersFinderMatija Čupić2017-11-282-15/+25
| * Fix redundant newline in clusters functional testMatija Čupić2017-11-271-1/+0
| * Show specific cluster page when testing IngressMatija Čupić2017-11-271-1/+1
| * Expect the correct link after destroying clusterMatija Čupić2017-11-271-1/+1
| * Change click_button to click_link occurenceMatija Čupić2017-11-271-3/+3
| * Merge branch 'list-multiple-clusters' of https://gitlab.com/gitlab-org/gitlab...Filipa Lacerda2017-11-274-5/+82
| |\
| | * Fix symbolization error in #clustersMatija Čupić2017-11-271-1/+1
| | * Add specs for scoping in ClustersControllerMatija Čupić2017-11-271-0/+16
| | * Add pagination specs for ClustersControllerMatija Čupić2017-11-271-0/+10
| | * Add specs for cluster countersMatija Čupić2017-11-271-3/+21
| | * Use current_user in ClustersController#clustersMatija Čupić2017-11-271-1/+1
| | * Add specs for ClustersFinderMatija Čupić2017-11-271-0/+33
| * | Adds JS unit testsFilipa Lacerda2017-11-2711-87/+99
| |/
| * Add cluster pagination to ClustersController#indexMatija Čupić2017-11-271-0/+1
| * Use global project variable in ClustersFinderMatija Čupić2017-11-271-3/+3
| * Fix mixup with enabled/disabled in ClustersFinderMatija Čupić2017-11-271-2/+2
| * Use ClustersFinder in ClustersController#clustersMatija Čupić2017-11-271-2/+6
| * Create ClustersFinderMatija Čupić2017-11-271-0/+19
| * Add cluster counts to ClustersController#indexMatija Čupić2017-11-271-1/+3
| * Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-11-2759-148/+665
| |\
| * \ Merge branch 'list-multiple-clusters' of https://gitlab.com/gitlab-org/gitlab...Filipa Lacerda2017-11-271-5/+1
| |\ \
| | * | Simplify Clusters::CreateService cluster checkMatija Čupić2017-11-241-5/+1
| * | | Handle toggle button with API requestFilipa Lacerda2017-11-2412-129/+243
| * | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-11-24223-2079/+2895
| |\ \ \ | | |/ / | |/| |