diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-26 08:47:09 +0100 |
| commit | a2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch) | |
| tree | e7d5e3e097ef85b871c7ab5b4673e6903c294144 /spec/javascripts/activities_spec.js.es6 | |
| parent | 13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff) | |
| parent | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff) | |
| download | gitlab-ce-issue-board-sidebar.tar.gz | |
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'spec/javascripts/activities_spec.js.es6')
| -rw-r--r-- | spec/javascripts/activities_spec.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index 743b15460c6..6699dee3cf7 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,4 +1,4 @@ -/*= require jquery.cookie.js */ +/*= require js.cookie.js */ /*= require jquery.endless-scroll.js */ /*= require pager */ /*= require activities */ |