Commit 1cf6e217 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Avoid conflicts with gitlab-ce!18722

parent 13dba821
...@@ -18,6 +18,7 @@ export default { ...@@ -18,6 +18,7 @@ export default {
human_total_time_spent: null, human_total_time_spent: null,
in_progress_merge_commit_sha: null, in_progress_merge_commit_sha: null,
merge_commit_sha: '53027d060246c8f47e4a9310fb332aa52f221775', merge_commit_sha: '53027d060246c8f47e4a9310fb332aa52f221775',
short_merge_commit_sha: '53027d06',
merge_error: null, merge_error: null,
merge_params: { merge_params: {
force_remove_source_branch: null, force_remove_source_branch: null,
...@@ -223,6 +224,7 @@ export default { ...@@ -223,6 +224,7 @@ export default {
base_path: 'blob_path', base_path: 'blob_path',
head_path: 'blob_path', head_path: 'blob_path',
}, },
merge_commit_path: 'http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775',
}; };
// Codeclimate // Codeclimate
export const headIssues = [ export const headIssues = [
......
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