summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/commit/pipelines/pipelines_service.js.es62
-rw-r--r--changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
index 483b414126a..e9cae893857 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6
@@ -9,7 +9,7 @@
*/
class PipelinesService {
constructor(endpoint) {
- this.pipelines = Vue.resource(endpoint);
+ this.pipelines = Vue.resource(`${endpoint}.json`);
}
/**
diff --git a/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml b/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml
new file mode 100644
index 00000000000..b7505e28401
--- /dev/null
+++ b/changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Merge request pipelines displays JSON
+merge_request:
+author: