diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-10-11 20:37:20 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-10-11 20:37:20 +0300 |
| commit | c194f22814dc57128d6d6b247afbd7e34ea397d2 (patch) | |
| tree | f9c52de0a9bb1129a5b8e23dbbc646b547f1ba3c /app/assets/javascripts/notes.js | |
| parent | 8b3ba1899ae9e09b64f4a7c48d65a7a4853ead59 (diff) | |
| parent | 03cd536b54b148eb59cabfa735c0ec6820fc2266 (diff) | |
Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master'
Cleanup data-page attribute after each Karma test
Closes #38871
See merge request gitlab-org/gitlab-ce!14742
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 fae72013957..790f78d2e11 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1258,7 +1258,7 @@ export default class Notes { } static checkMergeRequestStatus() { - if (getPagePath(1) === 'merge_requests') { + if (getPagePath(1) === 'merge_requests' && gl.mrWidget) { gl.mrWidget.checkStatus(); } } |