diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-07-28 21:52:09 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-07-28 21:52:09 -0400 |
| commit | 51fcfc735091a161a79f02ede882b197925d8106 (patch) | |
| tree | 3de2b06d35dbf36193f24ff3e743d4310f2efbca /app | |
| parent | 799c8edf20f2e0595ccd9afcb4fffa58165f3187 (diff) | |
| download | gitlab-ce-51fcfc735091a161a79f02ede882b197925d8106.tar.gz | |
Adds `raw_size` to take advantage of LFS
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/repo/repo_commit_section.vue | 6 | ||||
| -rw-r--r-- | app/controllers/concerns/renders_blob.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/repo/repo_commit_section.vue b/app/assets/javascripts/repo/repo_commit_section.vue index 841483c0350..85c7ff2b0a5 100644 --- a/app/assets/javascripts/repo/repo_commit_section.vue +++ b/app/assets/javascripts/repo/repo_commit_section.vue @@ -24,10 +24,6 @@ const RepoCommitSection = { // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions const branch = Helper.getBranch(); const commitMessage = this.commitMessage; - this.changedFiles.map((f) => { - console.log('fffff',f.newContent) - }); - return; const actions = this.changedFiles.map((f) => { const filePath = Helper.getFilePathFromFullPath(f.url, branch); return { @@ -37,7 +33,7 @@ const RepoCommitSection = { }; }); const payload = { - branch, + branch: Store.targetBranch, commit_message: commitMessage, actions, }; diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb index 1440fff1527..a048445de1d 100644 --- a/app/controllers/concerns/renders_blob.rb +++ b/app/controllers/concerns/renders_blob.rb @@ -20,7 +20,7 @@ module RendersBlob mime_type: blob.mime_type, name: blob.name, extension: blob.extension, - size: blob.size + size: blob.raw_size } else render json: { |