Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '38464-k8s-apps' into 'master' | Kamil Trzciński | 2017-11-07 | 12 | -126/+637 |
|\ | |||||
| * | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-08 | 15 | -79/+227 |
| |\ | |||||
| * \ | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Shinya Maeda | 2017-11-07 | 2 | -5/+3 |
| |\ \ | |||||
| | * | | Use flash for dismissable alerts | Eric Eastwood | 2017-11-07 | 1 | -4/+2 |
| | * | | Update Cluster application install to be enabled when errored | Eric Eastwood | 2017-11-07 | 1 | -1/+1 |
| * | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 18 | -97/+233 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into... | Shinya Maeda | 2017-11-07 | 12 | -126/+639 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into 38464-k8s-apps | Eric Eastwood | 2017-11-06 | 53 | -354/+331 |
| | |\ \ \ | |||||
| | * | | | | Fix comma dangle eslint in application_row.vue | Eric Eastwood | 2017-11-06 | 1 | -1/+1 |
| | * | | | | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps' | Kamil Trzciński | 2017-11-06 | 12 | -126/+639 |
| | |\ \ \ \ | |||||
| | | * | | | | I18n general app error and update attributes from review | Eric Eastwood | 2017-11-06 | 2 | -10/+20 |
| | | * | | | | Add FE tests for not_installable/scheduled and cluster banner rules36629-35958-add-cluster-application-section | Eric Eastwood | 2017-11-06 | 4 | -22/+36 |
| | | * | | | | Add support for not_installable/scheduled and to not show created banner | Kamil Trzcinski | 2017-11-06 | 3 | -3/+11 |
| | | * | | | | Remove not used ingress and runner | Kamil Trzcinski | 2017-11-06 | 2 | -6/+0 |
| | | * | | | | Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-... | Kamil Trzcinski | 2017-11-06 | 39 | -654/+751 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Add applications section to GKE clusters page | Eric Eastwood | 2017-11-03 | 12 | -126/+613 |
* | | | | | | | | Merge branch '39798-revert-gear-animation' into 'master' | Clement Ho | 2017-11-07 | 1 | -16/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert Autodevops gear animation39798-revert-gear-animation | Eric Eastwood | 2017-11-06 | 1 | -16/+0 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master' | Filipa Lacerda | 2017-11-07 | 4 | -3/+10 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-width | Phil Hughes | 2017-11-07 | 4 | -3/+10 |
* | | | | | | | | Merge branch '38394-smarter-interval' into 'master' | Filipa Lacerda | 2017-11-07 | 2 | -11/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i... | Simon Knox | 2017-11-07 | 63 | -396/+420 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | update changelog | Simon Knox | 2017-11-07 | 1 | -1/+1 |
| * | | | | | | | | fix line lint | Simon Knox | 2017-11-06 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i... | Simon Knox | 2017-11-06 | 205 | -4610/+5974 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | review feedback - throw error in smart_callback catch block | Simon Knox | 2017-11-02 | 1 | -2/+3 |
| * | | | | | | | | update docstring | Simon Knox | 2017-10-31 | 1 | -1/+1 |
| * | | | | | | | | remove global export from SmartInterval | Simon Knox | 2017-10-31 | 2 | -4/+4 |
| * | | | | | | | | don't re-run smart interval callback if there is already one in progress | Simon Knox | 2017-10-24 | 2 | -6/+20 |
* | | | | | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master' | Filipa Lacerda | 2017-11-07 | 13 | -68/+200 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | fixed karma testmulti-file-editor-separate-commits-call | Phil Hughes | 2017-11-06 | 1 | -1/+1 |
| * | | | | | | | | moved key into data structure | Phil Hughes | 2017-11-06 | 4 | -5/+12 |
| * | | | | | | | | correctly updates commit data after committing changes | Phil Hughes | 2017-11-06 | 9 | -79/+126 |
| * | | | | | | | | only allow the call when not in collapsed view | Phil Hughes | 2017-11-06 | 2 | -2/+4 |
| * | | | | | | | | Multi-file editor fetch log data from a different endpoint | Phil Hughes | 2017-11-06 | 9 | -17/+93 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master' | Sean McGivern | 2017-11-07 | 13 | -65/+163 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | appease lint2518-saved-configuration-for-issue-board | Simon Knox | 2017-11-07 | 1 | -3/+1 |
| * | | | | | | | unused prop | Simon Knox | 2017-11-06 | 1 | -7/+1 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf... | Simon Knox | 2017-11-06 | 64 | -943/+1091 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | fix bad master merge | Simon Knox | 2017-11-02 | 1 | -4/+4 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf... | Simon Knox | 2017-11-01 | 68 | -1882/+2036 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | resolve conflicts | Simon Knox | 2017-10-31 | 1 | -42/+17 |
| * | | | | | | | | match UX guide for submit/cancel buttons | Simon Knox | 2017-10-31 | 1 | -2/+2 |
| * | | | | | | | | apply changes for JS and CSS from gitlab-ee!2912 | Simon Knox | 2017-10-31 | 15 | -65/+183 |
* | | | | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master' | Tim Zallmann | 2017-11-07 | 5 | -32/+70 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | make legend X-offset into a constantmultiple-query-prometheus-graphs | Mike Greiling | 2017-11-06 | 2 | -6/+8 |
| * | | | | | | | | fix eslint max-line | Mike Greiling | 2017-11-06 | 1 | -1/+2 |
| * | | | | | | | | correctly set the domain of a result set when it is different on other tracks | Mike Greiling | 2017-11-06 | 2 | -11/+11 |
| * | | | | | | | | simplify legend label for additonal tracks | Mike Greiling | 2017-11-06 | 1 | -1/+1 |
| * | | | | | | | | fix karma failures | Mike Greiling | 2017-11-06 | 1 | -1/+1 |