Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve conflicts | bikebilly | 2017-11-07 | 117 | -865/+1153 |
|\ | |||||
| * | 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 |
| | * | add dashed and dotted line styles for multiple-query graphs | Mike Greiling | 2017-11-06 | 4 | -10/+31 |
| | * | add track information to data legend | Mike Greiling | 2017-11-06 | 1 | -3/+7 |
| | * | process all queries within a graph | Mike Greiling | 2017-11-06 | 1 | -16/+24 |
| | * | pass all graph queries into createTimeSeries | Mike Greiling | 2017-11-06 | 2 | -2/+3 |
| | * | fix bug in which axes are scaled only to first data set | Mike Greiling | 2017-11-06 | 1 | -2/+3 |
| * | | fix borderzero lintmaster-lint | Simon Knox | 2017-11-07 | 1 | -1/+1 |
| * | | Merge branch 'es-module-copy_as_gfm' into 'master' | Filipa Lacerda | 2017-11-06 | 4 | -9/+17 |
| |\ \ | |||||
| | * | | fix broken reference to transformGFMSelectiones-module-copy_as_gfm | Mike Greiling | 2017-11-01 | 1 | -2/+3 |
| | * | | remove global export except in test environments | Mike Greiling | 2017-11-01 | 2 | -5/+11 |
| | * | | move to copy_as_gfm to behaviors since it is invoked on every page | Mike Greiling | 2017-11-01 | 3 | -3/+4 |
| * | | | Merge branch '34768-fix-issuable-header-wrapping' into 'master' | Annabel Dunstone Gray | 2017-11-06 | 4 | -8/+27 |
| |\ \ \ | |||||
| | * | | | 34768 Fix problem with issuable header wrapping when content is too long34768-fix-issuable-header-wrapping | tauriedavis | 2017-11-03 | 4 | -8/+27 |
| * | | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master' | Clement Ho | 2017-11-06 | 2 | -3/+15 |
| |\ \ \ \ | |||||
| | * | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when iss... | Jacopo | 2017-11-06 | 2 | -3/+15 |
| * | | | | | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 26 | -327/+539 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clusters | Shinya Maeda | 2017-11-06 | 1 | -1/+1 |
| | * | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 8 | -57/+18 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 51 | -694/+852 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into refactor-clusters | Eric Eastwood | 2017-11-03 | 9 | -33/+51 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix tests. Remove NOT NULL constraint from cluster.user. | Shinya Maeda | 2017-11-03 | 1 | -0/+3 |
| | * | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 83 | -627/+728 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix some tests | Shinya Maeda | 2017-11-03 | 2 | -3/+2 |
| | * | | | | | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll... | Shinya Maeda | 2017-11-02 | 5 | -39/+28 |
| | * | | | | | | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i... | Shinya Maeda | 2017-11-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Pass cluster_id | Kamil Trzcinski | 2017-11-01 | 1 | -1/+1 |
| | * | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 20 | -465/+513 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Revert back FetchKubernetesTokenService | Kamil Trzcinski | 2017-11-01 | 6 | -38/+88 |
| | * | | | | | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer... | Kamil Trzcinski | 2017-11-01 | 3 | -126/+41 |
| | * | | | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 2 | -6/+12 |
| | * | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 177 | -2169/+3374 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | specs for feature | Shinya Maeda | 2017-11-01 | 4 | -13/+10 |
| | * | | | | | | | | | | | specs for controller. Improved validation | Shinya Maeda | 2017-10-31 | 4 | -15/+18 |
| | * | | | | | | | | | | | specs for workers. | Shinya Maeda | 2017-10-31 | 2 | -4/+4 |
| | * | | | | | | | | | | | specs for services. Improved details. | Shinya Maeda | 2017-10-30 | 3 | -6/+7 |
| | * | | | | | | | | | | | specs for models. Improved details. | Shinya Maeda | 2017-10-30 | 6 | -40/+47 |
| | * | | | | | | | | | | | This works | Shinya Maeda | 2017-10-23 | 19 | -162/+235 |
| | * | | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform | Kamil Trzcinski | 2017-10-23 | 21 | -357/+526 |
| * | | | | | | | | | | | | Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master' | Clement Ho | 2017-11-06 | 2 | -22/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix karma | Luke "Jared" Bennett | 2017-11-02 | 1 | -2/+2 |
| | * | | | | | | | | | | | | Separate preview and write tabs into seperate events | Luke "Jared" Bennett | 2017-11-02 | 2 | -24/+26 |
| | * | | | | | | | | | | | | Fix markdown-preview events for new isPreview var | Luke "Jared" Bennett | 2017-11-01 | 1 | -5/+12 |
| | * | | | | | | | | | | | | Let field.vue handle the changing of preview | Luke "Jared" Bennett | 2017-11-01 | 2 | -11/+11 |
| | * | | | | | | | | | | | | Dont emit toggle-markdown event if current target is already active and add s... | Luke "Jared" Bennett | 2017-11-01 | 1 | -5/+11 |