diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-02-14 06:05:58 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-02-14 06:05:58 +1100 |
| commit | 6059fdef5ebdeb8efd592f3c6bbc762d1d2a491f (patch) | |
| tree | d9e6614cf5c308426315764438494d80f655c5af /app/assets/javascripts/notes.js | |
| parent | 3ee13984ce1157b6362a2c0bcb1c1b3e6c48649d (diff) | |
| parent | 49e44d88b90939ece219e2cffc11119854306bd9 (diff) | |
| download | gitlab-ce-6059fdef5ebdeb8efd592f3c6bbc762d1d2a491f.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor
Diffstat (limited to 'app/assets/javascripts/notes.js')
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 599af9312b4..e5892f199cd 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -456,7 +456,7 @@ require('./task_list'); var mergeRequestId = $form.data('noteable-iid'); if (ResolveService != null) { - ResolveService.toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId); + ResolveService.toggleResolveForDiscussion(mergeRequestId, discussionId); } } |