summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-13 14:25:55 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-13 14:25:55 +0000
commit84e1cc5592028493958853c41242b14c489a7236 (patch)
treedf6d2ed4425c03173f0c857fc34aa2b1d2cb7d00 /app/assets/javascripts
parent85349c961c0c16cc2b2ed0e719cd549146e912d9 (diff)
parentdff411d7372b9ec59575268885a48004942de2e4 (diff)
downloadgitlab-ce-84e1cc5592028493958853c41242b14c489a7236.tar.gz
Merge branch 'fix/cycle-analytics-events-limit' into 'master'
Add limit to the number of events showed in cycle analytics See merge request !7743
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es66
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
index 513298ba4e7..8652479e7bf 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
@@ -13,6 +13,12 @@
<div>
<div class="events-description">
{{ stage.description }}
+ <span v-if="items.length === 50" class="events-info pull-right">
+ <i class="fa fa-warning has-tooltip"
+ title="Limited to showing 50 events at most"
+ data-placement="top"></i>
+ Showing 50 events
+ </span>
</div>
<ul class="stage-event-list">
<li v-for="commit in items" class="stage-event-item">