summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-22 09:39:55 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-22 09:39:55 +0000
commit7dd21a8bfd418705c26fcc9e081450ef6f4aae86 (patch)
tree0543141385a2a0e6b534d3bad02a36a0be84c4e8
parenta970f8c65db2a0847b34d31a4bbe05e1a2b8f64b (diff)
parent6c2ab27aeaf0cd59d87e14876492a4162d48e2d7 (diff)
downloadgitlab-ce-7dd21a8bfd418705c26fcc9e081450ef6f4aae86.tar.gz
Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master'
Resolve "Cycle analytics date filter is not working" Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892 See merge request !6906
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/assets/javascripts/cycle_analytics.js.es66
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c39ddca7cf..5d8c782c2c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Update duration at the end of pipeline
- ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup
- Add group level labels. (!6425)
+ - Fix Cycle analytics not showing correct data when filtering by date. !6906
- Add an example for testing a phoenix application with Gitlab CI in the docs (Manthan Mallikarjun)
- Cancelled pipelines could be retried. !6927
- Updating verbiage on git basics to be more intuitive
diff --git a/app/assets/javascripts/cycle_analytics.js.es6 b/app/assets/javascripts/cycle_analytics.js.es6
index bd9accacb8c..20791bab942 100644
--- a/app/assets/javascripts/cycle_analytics.js.es6
+++ b/app/assets/javascripts/cycle_analytics.js.es6
@@ -36,7 +36,11 @@
method: 'GET',
dataType: 'json',
contentType: 'application/json',
- data: { start_date: options.startDate }
+ data: {
+ cycle_analytics: {
+ start_date: options.startDate
+ }
+ }
}).done((data) => {
this.decorateData(data);
this.initDropdown();