diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-06 11:34:37 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-06 11:34:37 +0200 |
| commit | 9860ab0f224839f818c4216a66a0f1df075b53cf (patch) | |
| tree | d6158d128328b67e720de9bca60357e4839b6b68 | |
| parent | 919e702c865ab3b7943a81f70863ac28225aacf1 (diff) | |
| download | gitlab-ce-disable-sticky-diffs.tar.gz | |
Remove sticky-diff functionalitydisable-sticky-diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 5 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 5dc441f64b5..a132a0a9dcc 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -69,7 +69,6 @@ class @MergeRequestTabs @loadCommits($target.attr('href')) else if action == 'diffs' @loadDiff($target.attr('href')) - @stickyDiffHeaders() @setCurrentAction(action) @@ -137,15 +136,11 @@ class @MergeRequestTabs url: "#{source}.json" success: (data) => document.getElementById('diffs').innerHTML = data.html - @stickyDiffHeaders() @diffsLoaded = true toggleLoading: -> $('.mr-loading-status .loading').toggle() - stickyDiffHeaders: -> - $('.diff-header').trigger('sticky_kit:recalc') - _get: (options) -> defaults = { beforeSend: @toggleLoading diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index ec8974c5475..52c1e03040c 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -20,6 +20,3 @@ Failed to collect changes %p Maybe diff is really big and operation failed with timeout. Try to get diff locally - -:coffeescript - $('.files .diff-header').stick_in_parent(offset_top: $('.navbar').height()) |