Merge branch 'master' into fe-paginated-environments-api

* master: (97 commits)
  convert js-cookie dependency to an npm module
  convert timeago.js dependency to an npm module
  remove vue from vendor since it is now in node_modules
  Add CHANGELOG file
  Stylize blockquote in notification emails
  Add js prefix to right sidebar
  Replace accidentally deleted metaclick
  Remove right padding from navbar-collapse on large screens
  Add changelog
  common_utils merge conflicts
  Set sidebar height to 100% if at top of page
  Set height of fixed sidebars with js
  Add sticky sidebar on wiki page
  Fix comment button test for slash commands
  Fix time tracking spec
  Fix issue boards sidebar alignment and sidebar toggle spec
  Fix failing conflicts test
  Fix build sidebar scrolling
  Refactor JS
  Fix pinned sidebar alignment
  ...

5 files changed, 6 insertions, 6 deletions

diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index b84126c0e3d..1541037888f 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -40,7 +40,7 @@ require('~/behaviors/quick_submit');
       expect($('input[type=submit]')).toBeDisabled();
       return expect($('button[type=submit]')).toBeDisabled();
     });
-    // We cannot stub `navigator.userAgent` for CI's `rake teaspoon` task, so we'll
+    // We cannot stub `navigator.userAgent` for CI's `rake karma` task, so we'll
     // only run the tests that apply to the current platform
     if (navigator.userAgent.match(/Macintosh/)) {
       it('responds to Meta+Enter', function() {
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index dd614e50d7f..88413d9ae2b 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -1,4 +1,4 @@
-window.timeago = require('vendor/timeago');
+window.timeago = require('timeago.js');
 const EnvironmentItem = require('~/environments/components/environment_item');
 
 describe('Environment item', () => {
diff --git a/spec/javascripts/filtered_search/dropdown_user_spec.js.es6 b/spec/javascripts/filtered_search/dropdown_user_spec.js.es6
index f4b0d60db34..fa9d03c8a9a 100644
--- a/spec/javascripts/filtered_search/dropdown_user_spec.js.es6
+++ b/spec/javascripts/filtered_search/dropdown_user_spec.js.es6
@@ -9,7 +9,7 @@ require('~/filtered_search/dropdown_user');
       let dropdownUser;
 
       beforeEach(() => {
-        spyOn(gl.FilteredSearchDropdown.prototype, 'constructor').and.callFake(() => {});
+        spyOn(gl.DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
         spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
         spyOn(gl.DropdownUtils, 'getSearchInput').and.callFake(() => {});
 
@@ -39,7 +39,7 @@ require('~/filtered_search/dropdown_user');
 
     describe('config droplabAjaxFilter\'s endpoint', () => {
       beforeEach(() => {
-        spyOn(gl.FilteredSearchDropdown.prototype, 'constructor').and.callFake(() => {});
+        spyOn(gl.DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
         spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
       });
 
diff --git a/spec/javascripts/fixtures/header.html.haml b/spec/javascripts/fixtures/header.html.haml
index 4db2ef604de..f397f69e753 100644
--- a/spec/javascripts/fixtures/header.html.haml
+++ b/spec/javascripts/fixtures/header.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab.nav_header_class
+%header.navbar.navbar-gitlab.nav_header_class
   .container-fluid
     .header-content
       %button.side-nav-toggle
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 7df8d2fd8b4..030d2de090a 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -7,7 +7,7 @@ jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
 // include common libraries
 window.$ = window.jQuery = require('jquery');
 window._ = require('underscore');
-window.Cookies = require('vendor/js.cookie');
+window.Cookies = require('js-cookie');
 window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
 require('jquery-ujs');