diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-14 19:23:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-14 19:23:17 +0000 |
| commit | c89517a3e0cd12718a903136b90e4d74da6e17c7 (patch) | |
| tree | e6192cef211fb27eafa754e627e32d02bb756062 /spec/javascripts/activities_spec.js | |
| parent | 51773ea6456a81bfb07b82480661614fe0c06d85 (diff) | |
| parent | ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e (diff) | |
| download | gitlab-ce-41014-bump-svg-version.tar.gz | |
Merge branch 'master' into 41014-bump-svg-version41014-bump-svg-version
* master:
Docs: add indexes for monitoring and performance monitoring
clearer-documentation-on-inline-diffs
Add docs for commit diff discussion in merge requests
Converted JS modules into exported modules
Update flipper to 0.11.0 and take advantage of the new features
Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Diffstat (limited to 'spec/javascripts/activities_spec.js')
| -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) { |