Merge branch 'master' into ref-switcher-enter-submit

1 files changed, 0 insertions, 51 deletions

diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee
deleted file mode 100644
index c132cc8c542..00000000000
--- a/app/assets/javascripts/diff.js.coffee
+++ /dev/null
@@ -1,51 +0,0 @@
-class @Diff
-  UNFOLD_COUNT = 20
-  constructor: ->
-    $('.files .diff-file').singleFileDiff()
-    @filesCommentButton = $('.files .diff-file').filesCommentButton()
-
-    $(document).off('click', '.js-unfold')
-    $(document).on('click', '.js-unfold', (event) =>
-      target = $(event.target)
-      unfoldBottom = target.hasClass('js-unfold-bottom')
-      unfold = true
-
-      [old_line, line_number] = @lineNumbers(target.parent())
-      offset = line_number - old_line
-
-      if unfoldBottom
-        line_number += 1
-        since = line_number
-        to = line_number + UNFOLD_COUNT
-      else
-        [prev_old_line, prev_new_line] = @lineNumbers(target.parent().prev())
-        line_number -= 1
-        to = line_number
-        if line_number - UNFOLD_COUNT > prev_new_line + 1
-          since = line_number - UNFOLD_COUNT
-        else
-          since = prev_new_line + 1
-          unfold = false
-
-      link = target.parents('.diff-file').attr('data-blob-diff-path')
-      params =
-        since: since
-        to: to
-        bottom: unfoldBottom
-        offset: offset
-        unfold: unfold
-        # indent is used to compensate for single space indent to fit
-        # '+' and '-' prepended to diff lines,
-        # see https://gitlab.com/gitlab-org/gitlab-ce/issues/707
-        indent: 1
-
-      $.get(link, params, (response) ->
-        target.parent().replaceWith(response)
-      )
-    )
-
-  lineNumbers: (line) ->
-    return ([0, 0]) unless line.children().length
-    lines = line.children().slice(0, 2)
-    line_numbers = ($(l).attr('data-linenumber') for l in lines)
-    (parseInt(line_number) for line_number in line_numbers)