diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
| commit | 742e6eeed221489d5f35bdfde2e6ce55db75d25f (patch) | |
| tree | 710c01fbd18e81a7590819161434e19855e35a97 /app/assets/javascripts/diff.js.coffee | |
| parent | 7a5072c5a8f03cd7342a5f8e74e1fde0250ce360 (diff) | |
| parent | bbf9953b99d59801c72dd7b9550ee149ca77bfcf (diff) | |
| download | gitlab-ce-742e6eeed221489d5f35bdfde2e6ce55db75d25f.tar.gz | |
Merge branch 'upstream-master' into markdown-preview
Conflicts:
spec/routing/project_routing_spec.rb
Diffstat (limited to 'app/assets/javascripts/diff.js.coffee')
| -rw-r--r-- | app/assets/javascripts/diff.js.coffee | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee index dbe00c487dc..52b4208524f 100644 --- a/app/assets/javascripts/diff.js.coffee +++ b/app/assets/javascripts/diff.js.coffee @@ -1,4 +1,4 @@ -class Diff +class @Diff UNFOLD_COUNT = 20 constructor: -> $(document).on('click', '.js-unfold', (event) => @@ -41,6 +41,3 @@ class Diff 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) - - -@Diff = Diff |