diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 04:08:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 04:08:49 +0000 |
| commit | d7aecf68e02cb9ac3b7e022aca60e15a65a62ac6 (patch) | |
| tree | f720ac49bdf21e4912739b7deccf094a36f8f6bf /app/assets/javascripts/diff.js.coffee | |
| parent | b9372c999707558b695fa401b4f660a3d38fce86 (diff) | |
| parent | f2ea9d9f3fc34d66c8b6c630ef8fb9b810b821e9 (diff) | |
| download | gitlab-ce-d7aecf68e02cb9ac3b7e022aca60e15a65a62ac6.tar.gz | |
Merge branch 'fix-sticky-header' into 'master'
Improve sticky headers in diffs
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
See merge request !450
Diffstat (limited to 'app/assets/javascripts/diff.js.coffee')
| -rw-r--r-- | app/assets/javascripts/diff.js.coffee | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee index 05f5af42571..069f91c30e1 100644 --- a/app/assets/javascripts/diff.js.coffee +++ b/app/assets/javascripts/diff.js.coffee @@ -37,8 +37,6 @@ class @Diff ) ) - $('.diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height()) - lineNumbers: (line) -> return ([0, 0]) unless line.children().length lines = line.children().slice(0, 2) |