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
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index d0c5a343d71..399473bec65 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -1,6 +1,6 @@
-
 const Vue = require('vue');
-const Timeago = require('vendor/timeago');
+const Timeago = require('timeago.j');
+
 require('../../lib/utils/text_utility');
 require('../../vue_shared/components/commit');
 const ActionsComponent = require('./environment_actions');