diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 13:20:41 -0500 |
| commit | bbfbcebdf69261bac6aa142f430719955e8e86b9 (patch) | |
| tree | 25916a1a761cb6c8fcdac4b20b76017a7f4506d3 /app/assets/javascripts/diff_notes/services/resolve.js | |
| parent | 3b82444eb7791e58e3e0ba2f08b8ccde48e3d4c6 (diff) | |
| parent | 920d55b9f8afd35e16351fb57d671acf66092e89 (diff) | |
| download | gitlab-ce-bbfbcebdf69261bac6aa142f430719955e8e86b9.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'app/assets/javascripts/diff_notes/services/resolve.js')
| -rw-r--r-- | app/assets/javascripts/diff_notes/services/resolve.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js b/app/assets/javascripts/diff_notes/services/resolve.js index e1e2e3e93f9..4ea6ba8a73d 100644 --- a/app/assets/javascripts/diff_notes/services/resolve.js +++ b/app/assets/javascripts/diff_notes/services/resolve.js @@ -51,8 +51,10 @@ class ResolveServiceClass { discussion.updateHeadline(data); } else { - new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert'); + throw new Error('An error occurred when trying to resolve discussion.'); } + }).catch(() => { + new Flash('An error occurred when trying to resolve a discussion. Please try again.'); }); } |