Commit 3530274b authored by Phil Hughes's avatar Phil Hughes

only return last_commit_sha in the JSON

parent e906be2f
......@@ -47,7 +47,7 @@ export default {
baseRaw: null,
html: data.html,
size: data.size,
lastCommit: data.last_commit,
lastCommitSha: data.last_commit_sha,
});
},
[types.SET_FILE_RAW_DATA](state, { file, raw }) {
......
......@@ -17,6 +17,7 @@ export const dataStructure = () => ({
changed: false,
staged: false,
lastCommitPath: '',
lastCommitSha: '',
lastCommit: {
id: '',
url: '',
......@@ -112,7 +113,7 @@ export const createCommitPayload = ({ branch, newBranch, state, rootState }) =>
file_path: f.path,
content: f.content,
encoding: f.base64 ? 'base64' : 'text',
last_commit_id: newBranch ? undefined : f.lastCommit.id,
last_commit_id: newBranch ? undefined : f.lastCommitSha,
})),
start_branch: newBranch ? rootState.currentBranchId : undefined,
});
......
......@@ -197,13 +197,14 @@ class Projects::BlobController < Projects::ApplicationController
end
def show_json
set_last_commit_sha
path_segments = @path.split('/')
path_segments.pop
tree_path = path_segments.join('/')
last_commit = @repository.last_commit_for_path(@commit.id, @blob.path)
json = {
id: @blob.id,
last_commit_sha: @last_commit_sha,
path: blob.path,
name: blob.name,
extension: blob.extension,
......@@ -218,7 +219,6 @@ class Projects::BlobController < Projects::ApplicationController
blame_path: project_blame_path(project, @id),
commits_path: project_commits_path(project, @id),
tree_path: project_tree_path(project, File.join(@ref, tree_path)),
last_commit: last_commit,
permalink: project_blob_path(project, File.join(@commit.id, @path))
}
......
......@@ -243,9 +243,7 @@ describe('IDE commit module actions', () => {
...file('changed'),
type: 'blob',
active: true,
lastCommit: {
id: '123456789',
},
lastCommitSha: '123456789',
};
store.state.stagedFiles.push(f);
store.state.changedFiles = [
......
......@@ -76,9 +76,7 @@ describe('Multi-file store utils', () => {
...file('staged'),
path: 'staged',
content: 'updated file content',
lastCommit: {
id: '123456789',
},
lastCommitSha: '123456789',
},
{
...file('newFile'),
......@@ -86,9 +84,7 @@ describe('Multi-file store utils', () => {
tempFile: true,
content: 'new file content',
base64: true,
lastCommit: {
id: '123456789',
},
lastCommitSha: '123456789',
},
],
currentBranchId: 'master',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment