kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '52472-pipeline-endpoint-json' into 'master'

Browse source 
Adds `.json` to the end of pipelines endpoint

Closes #52472

See merge request gitlab-org/gitlab-ce!22293
This commit is contained in:
Tim Zallmann 2018-10-11 15:18:44 +00:00
commit a8513c7dc3
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/jobs/store/actions.js
View file

@ -139,7 +139,7 @@ export const fetchStages = ({ state, dispatch }) => {
dispatch('requestStages'); dispatch('requestStages');
axios axios
.get(state.job.pipeline.path) .get(`${state.job.pipeline.path}.json`)
.then(({ data }) => { .then(({ data }) => {
dispatch('receiveStagesSuccess', data.details.stages); dispatch('receiveStagesSuccess', data.details.stages);
dispatch('fetchJobsForStage', data.details.stages[0]); dispatch('fetchJobsForStage', data.details.stages[0]);

5
changelogs/unreleased/52472-pipeline-endpoint-json.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix caching issue with pipelines URL
merge_request: 22293
author:
type: fixed

4
spec/javascripts/jobs/store/actions_spec.js
View file

@ -422,7 +422,7 @@ describe('Job State actions', () => {
beforeEach(() => { beforeEach(() => {
mockedState.job.pipeline = { mockedState.job.pipeline = {
path: `${TEST_HOST}/endpoint.json/stages`, path: `${TEST_HOST}/endpoint`,
}; };
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
}); });
@ -434,7 +434,7 @@ describe('Job State actions', () => {
describe('success', () => { describe('success', () => {
it('dispatches requestStages and receiveStagesSuccess, fetchJobsForStage ', done => { it('dispatches requestStages and receiveStagesSuccess, fetchJobsForStage ', done => {
mock mock
.onGet(`${TEST_HOST}/endpoint.json/stages`) .onGet(`${TEST_HOST}/endpoint.json`)
.replyOnce(200, { details: { stages: [{ id: 121212, name: 'build' }] } }); .replyOnce(200, { details: { stages: [{ id: 121212, name: 'build' }] } });
testAction( testAction(