summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflictsbikebilly2017-11-07117-865/+1153
|\
| * Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-075-32/+70
| |\
| | * make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
| | * fix eslint max-lineMike Greiling2017-11-061-1/+2
| | * correctly set the domain of a result set when it is different on other tracksMike Greiling2017-11-062-11/+11
| | * simplify legend label for additonal tracksMike Greiling2017-11-061-1/+1
| | * fix karma failuresMike Greiling2017-11-061-1/+1
| | * add dashed and dotted line styles for multiple-query graphsMike Greiling2017-11-064-10/+31
| | * add track information to data legendMike Greiling2017-11-061-3/+7
| | * process all queries within a graphMike Greiling2017-11-061-16/+24
| | * pass all graph queries into createTimeSeriesMike Greiling2017-11-062-2/+3
| | * fix bug in which axes are scaled only to first data setMike Greiling2017-11-061-2/+3
| * | fix borderzero lintmaster-lintSimon Knox2017-11-071-1/+1
| * | Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-064-9/+17
| |\ \
| | * | fix broken reference to transformGFMSelectiones-module-copy_as_gfmMike Greiling2017-11-011-2/+3
| | * | remove global export except in test environmentsMike Greiling2017-11-012-5/+11
| | * | move to copy_as_gfm to behaviors since it is invoked on every pageMike Greiling2017-11-013-3/+4
| * | | Merge branch '34768-fix-issuable-header-wrapping' into 'master'Annabel Dunstone Gray2017-11-064-8/+27
| |\ \ \
| | * | | 34768 Fix problem with issuable header wrapping when content is too long34768-fix-issuable-header-wrappingtauriedavis2017-11-034-8/+27
| * | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'Clement Ho2017-11-062-3/+15
| |\ \ \ \
| | * | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when iss...Jacopo2017-11-062-3/+15
| * | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0626-327/+539
| |\ \ \ \ \
| | * | | | | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-061-1/+1
| | * | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-068-57/+18
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0551-694/+852
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into refactor-clustersEric Eastwood2017-11-039-33/+51
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-031-0/+3
| | * | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0383-627/+728
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix some testsShinya Maeda2017-11-032-3/+2
| | * | | | | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-025-39/+28
| | * | | | | | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i...Shinya Maeda2017-11-021-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| | * | | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0220-465/+513
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-016-38/+88
| | * | | | | | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-013-126/+41
| | * | | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-012-6/+12
| | * | | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-01177-2169/+3374
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | specs for featureShinya Maeda2017-11-014-13/+10
| | * | | | | | | | | | | specs for controller. Improved validationShinya Maeda2017-10-314-15/+18
| | * | | | | | | | | | | specs for workers.Shinya Maeda2017-10-312-4/+4
| | * | | | | | | | | | | specs for services. Improved details.Shinya Maeda2017-10-303-6/+7
| | * | | | | | | | | | | specs for models. Improved details.Shinya Maeda2017-10-306-40/+47
| | * | | | | | | | | | | This worksShinya Maeda2017-10-2319-162/+235
| | * | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-2321-357/+526
| * | | | | | | | | | | | Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-22/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix karmaLuke "Jared" Bennett2017-11-021-2/+2
| | * | | | | | | | | | | | Separate preview and write tabs into seperate eventsLuke "Jared" Bennett2017-11-022-24/+26
| | * | | | | | | | | | | | Fix markdown-preview events for new isPreview varLuke "Jared" Bennett2017-11-011-5/+12
| | * | | | | | | | | | | | Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-012-11/+11
| | * | | | | | | | | | | | Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-011-5/+11