From f03d9a9b42102a3eb88ba8a31059aef29d3675f2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 23 Oct 2017 14:24:51 +0100
Subject: fixed karma tests

---
 app/assets/javascripts/merge_request_tabs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index e64eb60231a..54c1b7a268e 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -68,6 +68,7 @@ import Diff from './diff';
 
     constructor({ action, setUrl, stubLocation } = {}) {
       const mergeRequestTabs = document.querySelector('.js-tabs-affix');
+      const navbar = document.querySelector('.navbar-gitlab');
       const paddingTop = 16;
 
       this.diffsLoaded = false;
@@ -79,7 +80,7 @@ import Diff from './diff';
       this.setCurrentAction = this.setCurrentAction.bind(this);
       this.tabShown = this.tabShown.bind(this);
       this.showTab = this.showTab.bind(this);
-      this.stickyTop = document.querySelector('.navbar-gitlab').offsetHeight - paddingTop;
+      this.stickyTop = navbar ? navbar.offsetHeight - paddingTop : 0;
 
       if (mergeRequestTabs) {
         this.stickyTop += mergeRequestTabs.offsetHeight;
-- 
cgit v1.2.1