diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /app/assets/javascripts/repo/services | |
parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
download | gitlab-ce-35659da185e3c6ec2862884b4e9e19dd20445957.tar.gz |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'app/assets/javascripts/repo/services')
-rw-r--r-- | app/assets/javascripts/repo/services/repo_service.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/services/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js index 8fba928e456..17578f3bbf3 100644 --- a/app/assets/javascripts/repo/services/repo_service.js +++ b/app/assets/javascripts/repo/services/repo_service.js @@ -2,6 +2,7 @@ import axios from 'axios'; import Store from '../stores/repo_store'; import Api from '../../api'; +import Helper from '../helpers/repo_helper'; const RepoService = { url: '', @@ -22,6 +23,7 @@ const RepoService = { getRaw(url) { return axios.get(url, { + // Stop Axios from parsing a JSON file into a JS object transformResponse: [res => res], }); }, @@ -36,7 +38,7 @@ const RepoService = { }, urlIsRichBlob(url = this.url) { - const extension = url.split('.').pop(); + const extension = Helper.getFileExtension(url); return this.richExtensionRegExp.test(extension); }, |