summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* copyeditdocs-admin-indexMarcia Ramos2017-12-061-1/+1
* delete EE itemMarcia Ramos2017-12-061-1/+0
* copyeditMarcia Ramos2017-12-061-4/+5
* copyeditMarcia Ramos2017-12-061-1/+1
* copyedit (Axil's review)Marcia Ramos2017-12-061-12/+12
* add note for .com usersMarcia Ramos2017-12-061-0/+4
* link directly to the admin indexMarcia Ramos2017-12-061-1/+1
* fix conflictsMarcia Ramos2017-12-06415-2800/+9253
|\
| * Merge branch '39364-in-issue-board-url-doesn-t-take-in-account-hostname-setti...Sean McGivern2017-12-065-2/+40
| |\
| | * Add changelog entry39364-in-issue-board-url-doesn-t-take-in-account-hostname-settingsLuke Bennett2017-12-051-0/+5
| | * add boards_helper_specLuke Bennett2017-12-032-0/+27
| | * Add spec for boards_endpoint instance variableLuke Bennett2017-12-031-0/+6
| | * Use path helper instead of url helperLuke Bennett2017-12-032-2/+2
| * | 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