summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/reports/store/actions.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/reports/store/actions.js')
-rw-r--r--app/assets/javascripts/reports/store/actions.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/reports/store/actions.js b/app/assets/javascripts/reports/store/actions.js
index 1b6a3b7cbb8..b0880254f31 100644
--- a/app/assets/javascripts/reports/store/actions.js
+++ b/app/assets/javascripts/reports/store/actions.js
@@ -31,7 +31,11 @@ export const restartPolling = () => {
* Poll.js will handle etag response.
* While http status code is 204, it means it's parsing, and we'll keep polling
* When http status code is 200, it means parsing is done, we can show the results & stop polling
+<<<<<<< HEAD
* When http status code is 500, it means parsing went wrong and we stop polling
+=======
+ * When http status code is 500, it means parsins went wrong and we stop polling
+>>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd
*/
export const fetchReports = ({ state, dispatch }) => {
dispatch('requestReports');