diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-14 17:22:35 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-14 17:22:35 +0000 |
commit | 26484cf125c49465ba32c9a95f9655c4e4a8fbdf (patch) | |
tree | 339faa6bced98f1e0842b235bfc87a3ea537e92b /spec | |
parent | 391bb437611b91e2767384ff9852beb573c84996 (diff) | |
parent | adb8483331a7d25f84029ecf67b33e1f09a1e99f (diff) | |
download | gitlab-ce-26484cf125c49465ba32c9a95f9655c4e4a8fbdf.tar.gz |
Merge branch 'ph-es-modules' into 'master'
Converted JS files into exported modules
See merge request gitlab-org/gitlab-ce!15933
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/activities_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/activities_spec.js b/spec/javascripts/activities_spec.js index e8c5f721423..fc9be14df8f 100644 --- a/spec/javascripts/activities_spec.js +++ b/spec/javascripts/activities_spec.js @@ -2,7 +2,7 @@ import 'vendor/jquery.endless-scroll'; import '~/pager'; -import '~/activities'; +import Activities from '~/activities'; (() => { window.gon || (window.gon = {}); @@ -35,7 +35,7 @@ import '~/activities'; describe('Activities', () => { beforeEach(() => { loadFixtures(fixtureTemplate); - new gl.Activities(); + new Activities(); }); for (let i = 0; i < filters.length; i += 1) { |