diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-26 08:34:05 +0000 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-07-27 15:09:22 -0300 |
commit | ead0424b5c1f80fb933d73e0ec4d876240d5172c (patch) | |
tree | 40a9240584f025cfe2965fff9fec70cf668015ef /app | |
parent | 2d0fe45163f0c64163a361d08f0d07e7a3fc2d7d (diff) | |
download | gitlab-ce-ead0424b5c1f80fb933d73e0ec4d876240d5172c.tar.gz |
Merge branch 'ide-edit-json-files' into 'master'
Fixed IDE not opening JSON files
See merge request gitlab-org/gitlab-ce!20798
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/services/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js index 49a481f25d5..cb93fba1665 100644 --- a/app/assets/javascripts/ide/services/index.js +++ b/app/assets/javascripts/ide/services/index.js @@ -18,7 +18,7 @@ export default { return axios .get(file.rawPath, { - params: { format: 'json' }, + transformResponse: [f => f], }) .then(({ data }) => data); }, @@ -33,7 +33,7 @@ export default { return axios .get(file.rawPath.replace(`/raw/${file.branchId}/${file.path}`, `/raw/${sha}/${file.path}`), { - params: { format: 'json' }, + transformResponse: [f => f], }) .then(({ data }) => data); }, |