Commit 13e1bb23 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'ph/codeNavigationParams' into 'master'

Changed code navigation get param to use blobPath

See merge request gitlab-org/gitlab!24854
parents 7011427d 1f199424
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
commit(types.REQUEST_DATA); commit(types.REQUEST_DATA);
api api
.lsifData(state.projectPath, state.commitId, state.path) .lsifData(state.projectPath, state.commitId, state.blobPath)
.then(({ data }) => { .then(({ data }) => {
const normalizedData = data.reduce((acc, d) => { const normalizedData = data.reduce((acc, d) => {
if (d.hover) { if (d.hover) {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#blob-content-holder.blob-content-holder #blob-content-holder.blob-content-holder
- if native_code_navigation_enabled?(@project) - if native_code_navigation_enabled?(@project)
#js-code-navigation{ data: { commit_id: blob.commit_id, path: blob.path, project_path: @project.full_path } } #js-code-navigation{ data: { commit_id: blob.commit_id, blob_path: blob.path, project_path: @project.full_path } }
%article.file-holder %article.file-holder
= render 'projects/blob/header', blob: blob = render 'projects/blob/header', blob: blob
= render 'projects/blob/content', blob: blob = render 'projects/blob/content', blob: blob
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