summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-23 21:33:50 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-23 21:33:50 +0300
commit3c9ea7f4a90a4d3902b36a94678f6f39c1a1cc61 (patch)
treeecd26654adc3fba7f52d4f796ad0811b393deeb9 /app/assets
parenta8fc10e3d0ca128daf0568857f1efc9b03c2e6fb (diff)
parent66c18eaeb3a63b277be9dc691eca194deee89045 (diff)
downloadgitlab-ce-3c9ea7f4a90a4d3902b36a94678f6f39c1a1cc61.tar.gz
Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge
Fix not rendered the network graph edges
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/branch-graph.js.coffee10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/branch-graph.js.coffee b/app/assets/javascripts/branch-graph.js.coffee
index b8af07579f2..010a2b0e42b 100644
--- a/app/assets/javascripts/branch-graph.js.coffee
+++ b/app/assets/javascripts/branch-graph.js.coffee
@@ -90,11 +90,15 @@ class @BranchGraph
renderPartialGraph: ->
start = Math.floor((@element.scrollTop() - @offsetY) / @unitTime) - 10
- start = 0 if start < 0
+ if start < 0
+ isGraphEdge = true
+ start = 0
end = start + 40
- end = @commits.length if @commits.length < end
+ if @commits.length < end
+ isGraphEdge = true
+ end = @commits.length
- if @prev_start == -1 or Math.abs(@prev_start - start) > 10
+ if @prev_start == -1 or Math.abs(@prev_start - start) > 10 or isGraphEdge
i = start
@prev_start = start