diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 09:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 09:09:30 +0300 |
| commit | 4dfc8711171fe0c04bc6b8b224687603026dea46 (patch) | |
| tree | e1b4640f8e56bb09f412a3dca1510983245491c2 /app/views/projects | |
| parent | cfd62c3a3ebbc85f5787c103bfa6de1997ab8e11 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 8e8a6b847df..a0f644717ad 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -10,7 +10,7 @@ #blob-content-holder.blob-content-holder - if @code_navigation_path - #js-code-navigation{ data: { code_nav_url: @code_navigation_path, definition_path_prefix: project_blob_path(@project, @ref) } } + #js-code-navigation{ data: { code_navigation_path: @code_navigation_path, blob_path: blob.path, definition_path_prefix: project_blob_path(@project, @ref) } } %article.file-holder = render 'projects/blob/header', blob: blob = render 'projects/blob/content', blob: blob diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 4304a18558e..7e146a36d84 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -51,6 +51,8 @@ .tab-content#diff-notes-app #js-diff-file-finder + - if native_code_navigation_enabled?(@project) + #js-code-navigation = render "projects/merge_requests/tabs/pane", id: "notes", class: "notes voting_notes" do .row %section.col-md-12 |