summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/repo/helpers
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-08-07 17:56:07 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-08-07 17:56:07 -0400
commitbc39218b4ed24e01a137d79fd98821aedc3666e5 (patch)
tree66211c859c67c4a1f68bd99de8c3749562f6a3f2 /app/assets/javascripts/repo/helpers
parent7572aaf352df238718416624282c8649ef142ca9 (diff)
downloadgitlab-ce-bc39218b4ed24e01a137d79fd98821aedc3666e5.tar.gz
Show warning for big files.
Diffstat (limited to 'app/assets/javascripts/repo/helpers')
-rw-r--r--app/assets/javascripts/repo/helpers/repo_helper.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
index 72436688f87..385a69e0389 100644
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -154,16 +154,19 @@ const RepoHelper = {
RepoHelper.setBinaryDataAsBase64(data);
Store.setViewToPreview();
} else if (!Store.isPreviewView()) {
- Service.getRaw(data.raw_path)
+ if(!data.render_error){
+ Service.getRaw(data.raw_path)
.then((rawResponse) => {
Store.blobRaw = rawResponse.data;
data.plain = rawResponse.data;
-
RepoHelper.setFile(data, file);
}).catch(RepoHelper.loadingError);
+ }
}
- if (Store.isPreviewView()) RepoHelper.setFile(data, file);
+ if (Store.isPreviewView()){
+ RepoHelper.setFile(data, file);
+ }
// if the file tree is empty
if (Store.files.length === 0) {
@@ -187,6 +190,9 @@ const RepoHelper = {
newFile.url = file.url || location.pathname;
newFile.url = file.url;
+ if(newFile.render_error === 'too_large'){
+ newFile.tooLarge = true;
+ }
newFile.newContent = '';
Store.addToOpenedFiles(newFile);