summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-06 15:54:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-06 15:54:38 +0200
commit17446ff0c98e870f0500279983432e5115e060a4 (patch)
treee63e81fc99461eecc43a33f0eb3719caff94892e /app/views
parentb2e2444436eef059e151869b4d2d0ea871ebc30e (diff)
parent99c3b112fae6c0ecfe1380610618c6e8005a7a35 (diff)
downloadgitlab-ce-17446ff0c98e870f0500279983432e5115e060a4.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/diffs/_diffs.html.haml3
1 files changed, 0 insertions, 3 deletions
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())