diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-06 13:23:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-06 13:23:32 +0000 |
| commit | 99c3b112fae6c0ecfe1380610618c6e8005a7a35 (patch) | |
| tree | 48e2f68c9401d6620daf72c823b53a57372e786a /app | |
| parent | 1165d3dce1c726f4c29ec1932cc6f386ce617e8d (diff) | |
| parent | 9860ab0f224839f818c4216a66a0f1df075b53cf (diff) | |
| download | gitlab-ce-99c3b112fae6c0ecfe1380610618c6e8005a7a35.tar.gz | |
Merge branch 'disable-sticky-diffs' into 'master'
Disable sticky diffs
Revert feature introduced in https://github.com/gitlabhq/gitlabhq/pull/8760
Why?
* It has unfixed bug for long time which is really annoying - https://github.com/gitlabhq/gitlabhq/pull/8760
* I was not able to properly fix it
* It affected performance in bad way
See merge request !935
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 5 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index c18ea929506..bb120424ccf 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -16,7 +16,6 @@ #= require jquery.scrollTo #= require jquery.blockUI #= require jquery.turbolinks -#= require jquery.sticky-kit.min #= require turbolinks #= require autosave #= require bootstrap 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()) |