diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-09 16:36:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-09 16:37:56 +0000 |
| commit | 5d0c5663a0368545653be3992c364eea74830062 (patch) | |
| tree | 2dbf3af8e16d742a493ac65c6e9c8654a0d060f0 | |
| parent | 4975f4160ac65b3d9ae51d074efcb61bb63cf6b4 (diff) | |
| download | gitlab-ce-5d0c5663a0368545653be3992c364eea74830062.tar.gz | |
Adds `.json` to the endpoint requested in order to avoid showing JSON
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml | 4 |
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: |