diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-01-25 09:47:36 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-01-25 10:00:17 +0000 |
| commit | 4903ff93971d28723ed9d81f7dae2ad2a1d5586a (patch) | |
| tree | 8f6f5cbc302f0820c1ffd0c85528388fd33bb8d7 /spec/javascripts/todos_spec.js | |
| parent | 3805cd7ac5e1c9b286bfba667ef45972eab4d084 (diff) | |
| parent | 944c1eb684fe979339262ba6e9f7bf9e1b77fc81 (diff) | |
| download | gitlab-ce-13931-custom-emoji-implementation.tar.gz | |
Merge branch 'master' into 13931-custom-emoji-implementation13931-custom-emoji-implementation
Conflicts:
app/assets/javascripts/dispatcher.js
app/assets/javascripts/pages/projects/shared/project_avatar.js
Diffstat (limited to 'spec/javascripts/todos_spec.js')
| -rw-r--r-- | spec/javascripts/todos_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/todos_spec.js b/spec/javascripts/todos_spec.js index 59e16f0786e..35871dddf89 100644 --- a/spec/javascripts/todos_spec.js +++ b/spec/javascripts/todos_spec.js @@ -1,5 +1,5 @@ import * as urlUtils from '~/lib/utils/url_utility'; -import Todos from '~/todos'; +import Todos from '~/pages/dashboard/todos/index/todos'; import '~/lib/utils/common_utils'; describe('Todos', () => { |