summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* add CHANGELOG.md entry for !15201Mike Greiling2017-11-061-0/+6
* simplify legend label for additonal tracksMike Greiling2017-11-061-1/+1
* fix karma failuresMike Greiling2017-11-064-4/+4
* 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
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-0621-97/+51
|\
| * updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-062-6/+10
| * align with the commentsmicael.bergeron2017-11-062-4/+1
| * ignore the column before the migrationmicael.bergeron2017-11-065-8/+5
| * fix the failing specremove-ensure-ref-fetched-from-controllersmicael.bergeron2017-11-032-2/+0
| * make the migration reversiblemicael.bergeron2017-11-032-2/+2
| * add changelog and move migration to post_migratemicael.bergeron2017-11-032-0/+5
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-0313-80/+33
* | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \
| * | Revert unintentional changes in !12810Takuya Noguchi2017-11-069-196/+101
* | | Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-3563...Sean McGivern2017-11-063-8/+16
|\ \ \
| * | | Add ChangelogPawel Chojnacki2017-11-061-0/+5
| * | | Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639Pawel Chojnacki2017-09-252-8/+11
* | | | Merge branch '27375-dashboard-activity-performance' into 'master'Douwe Maan2017-11-0636-225/+429
|\ \ \ \
| * | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-0636-225/+429
|/ / / /
* | | | Merge branch 'add-reconfigure-logs' into 'master'Stan Hu2017-11-061-0/+9
|\ \ \ \
| * | | | Add reconfigure docs to CEStan Hu2017-11-061-0/+9
* | | | | Merge branch 'jej/fs-prevent-push-when-missing-objects' into 'master'Douwe Maan2017-11-064-17/+101
|\ \ \ \ \
| * | | | | Replaced subject with subject.exec in spec/lib/gitlab/checks/change_access_sp...James Edwards-Jones2017-11-061-25/+19
| * | | | | Prevent git push when LFS objects are missingJames Edwards-Jones2017-11-064-3/+93
* | | | | | Merge branch 'dm-block-group-and-project-creation-when-external-by-default' i...Sean McGivern2017-11-063-5/+14
|\ \ \ \ \ \
| * | | | | | Make sure group and project creation is blocked for new users that are extern...Douwe Maan2017-11-063-5/+14
* | | | | | | Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-062-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-062-0/+10
* | | | | | | | Merge branch 'winh-skip-parsePikadayDate-test' into 'master'Filipa Lacerda2017-11-061-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove parsePikadayDate testwinh-skip-parsePikadayDate-testWinnie Hellmann2017-11-061-4/+2
* | | | | | | | | Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'Sean McGivern2017-11-0618-159/+223
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-0618-159/+223
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '38247-hide-create-mr-button-in-issue-show' into 'master'Rémy Coutable2017-11-063-11/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove create MR button from issues when MRs are disabledGeorge Andrinopoulos2017-11-063-11/+34
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-use-vue-warnhandler' into 'master'Phil Hughes2017-11-061-18/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Vue warnhandlerwinh-use-vue-warnhandlerWinnie Hellmann2017-11-061-18/+22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-066-37/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor issuable destroy actionJarka Kadlecova2017-11-066-37/+24
* | | | | | | | | Merge branch '39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci...Sean McGivern2017-11-061-7/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use the --parallel Rubocop flag in the static-analysis and improve the job39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-jobRémy Coutable2017-11-031-7/+16
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master'Douwe Maan2017-11-061-3/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ignore routes matching legacy_*_redirect in route specsSean McGivern2017-11-061-3/+16
* | | | | | | | | | Merge branch '38597-editor-icons' into 'master'Phil Hughes2017-11-0615-37/+58
|\ \ \ \ \ \ \ \ \ \