Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'throttle-touching-of-objects' into 'master' | Sean McGivern | 2017-12-06 | 10 | -3/+82 |
|\ | |||||
| * | Throttle the number of UPDATEs triggered by touch | Yorick Peterse | 2017-12-06 | 10 | -3/+82 |
* | | Merge branch 'patch-24' into 'master' | Sean McGivern | 2017-12-06 | 2 | -1/+6 |
|\ \ | |/ |/| | |||||
| * | Fix graph notes number duplication. | Vladislav Kaverin | 2017-12-03 | 2 | -1/+6 |
* | | Merge branch '39364-in-issue-board-url-doesn-t-take-in-account-hostname-setti... | Sean McGivern | 2017-12-06 | 5 | -2/+40 |
|\ \ | |||||
| * | | Add changelog entry39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings | Luke Bennett | 2017-12-05 | 1 | -0/+5 |
| * | | add boards_helper_spec | Luke Bennett | 2017-12-03 | 2 | -0/+27 |
| * | | Add spec for boards_endpoint instance variable | Luke Bennett | 2017-12-03 | 1 | -0/+6 |
| * | | Use path helper instead of url helper | Luke Bennett | 2017-12-03 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch 'ee-backport-issue_40654' into 'master' | Sean McGivern | 2017-12-06 | 2 | -4/+12 |
|\ \ | |||||
| * | | [CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654 | Felipe Artur | 2017-12-05 | 2 | -4/+12 |
* | | | Merge branch 'downgrade-grpc-to-1.4.5' into 'master' | Sean McGivern | 2017-12-06 | 1 | -5/+2 |
|\ \ \ | |||||
| * | | | Downgrade the grpc gem to 1.4.5downgrade-grpc-to-1.4.5 | Jacob Vosmaer | 2017-12-05 | 1 | -5/+2 |
* | | | | Merge branch 'backport-board-scope-highlight' into 'master' | Sean McGivern | 2017-12-06 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | backport board scope highlightbackport-board-scope-highlight | Clement Ho | 2017-12-05 | 1 | -0/+10 |
* | | | | | Merge branch '38869-templates' into 'master' | Phil Hughes | 2017-12-06 | 9 | -296/+278 |
|\ \ \ \ \ | |||||
| * | | | | | Export template selector as ES6 modules | Filipa Lacerda | 2017-12-06 | 9 | -296/+278 |
|/ / / / / | |||||
* | | | | | Merge branch '40543-generalize-detail-page-headers' into 'master' | Phil Hughes | 2017-12-06 | 9 | -79/+66 |
|\ \ \ \ \ | |||||
| * | | | | | Generalize detail page headers40543-generalize-detail-page-headers | Eric Eastwood | 2017-12-05 | 9 | -79/+66 |
* | | | | | | Merge branch 'list-multiple-clusters' into 'master' | Grzegorz Bizon | 2017-12-06 | 44 | -231/+1485 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove redundant empty line in CreateService spec | Matija Čupić | 2017-12-06 | 1 | -1/+0 |
| * | | | | | | Fix gcp|user_controller_specs | Kamil Trzcinski | 2017-12-06 | 2 | -4/+6 |
| * | | | | | | Refactor Clusters::CreateService spec | Matija Čupić | 2017-12-06 | 1 | -58/+62 |
| * | | | | | | Remove Add Cluster button from clusters/index | Matija Čupić | 2017-12-05 | 2 | -6/+0 |
| * | | | | | | Update externalized strings pot | Matija Čupić | 2017-12-05 | 1 | -22/+158 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clusters | Matija Čupić | 2017-12-05 | 188 | -670/+1546 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Remove trailing whitespace from Clusters spec | Matija Čupić | 2017-12-05 | 1 | -13/+13 |
| * | | | | | | | Move can_toggle_cluster? from helper to presenter | Matija Čupić | 2017-12-05 | 6 | -53/+47 |
| * | | | | | | | Mock Kaminari paginates_per instead of setting it | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Use ClustersFinder for setting counts | Matija Čupić | 2017-12-05 | 2 | -9/+7 |
| * | | | | | | | Fix overwritten project.cluster replacement | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Fix empty state partial check | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Fix rpsec all matchers in ClustersController specs | Matija Čupić | 2017-12-05 | 1 | -2/+2 |
| * | | | | | | | Test for empty state partial instead of index view | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Remove redundant view_clusters assignment | Matija Čupić | 2017-12-05 | 1 | -4/+2 |
| * | | | | | | | Replace Exception with ArgumentError | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Remove redundant return in Clusters::CreateService | Matija Čupić | 2017-12-05 | 1 | -1/+1 |
| * | | | | | | | Revert node_modules | Kamil Trzcinski | 2017-12-05 | 1 | -1/+0 |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into list-multiple-clusters | Kamil Trzcinski | 2017-12-05 | 29 | -70/+347 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag... | Kamil Trzcinski | 2017-12-05 | 8 | -9/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Remove references of project.cluster from specs | Matija Čupić | 2017-12-04 | 3 | -5/+5 |
| | * | | | | | | | | Remove cluster from Project model | Matija Čupić | 2017-12-04 | 2 | -2/+1 |
| | * | | | | | | | | Fix navbar CSS | Filipa Lacerda | 2017-12-04 | 4 | -9/+14 |
| | * | | | | | | | | Merge branch 'master' into list-multiple-clusters | Filipa Lacerda | 2017-12-04 | 383 | -3368/+8601 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use actual namespace | Kamil Trzcinski | 2017-12-03 | 1 | -1/+1 |
| | * | | | | | | | | | Fix clusters active/inactive toggling | Kamil Trzcinski | 2017-12-03 | 1 | -2/+3 |
| * | | | | | | | | | | Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus... | Kamil Trzcinski | 2017-12-05 | 164 | -996/+4315 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into 35616-move-k8-to-cluster-page | Kamil Trzcinski | 2017-12-05 | 29 | -164/+486 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Clean up clusters_controller_spec.rb | Shinya Maeda | 2017-12-05 | 1 | -27/+13 |
| | * | | | | | | | | | | | Add merge_request number in changelog | Shinya Maeda | 2017-12-05 | 1 | -1/+1 |