summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 06:09:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 06:09:30 +0000
commit4dfc8711171fe0c04bc6b8b224687603026dea46 (patch)
treee1b4640f8e56bb09f412a3dca1510983245491c2 /app/views/projects/merge_requests/show.html.haml
parentcfd62c3a3ebbc85f5787c103bfa6de1997ab8e11 (diff)
downloadgitlab-ce-4dfc8711171fe0c04bc6b8b224687603026dea46.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/show.html.haml')
-rw-r--r--app/views/projects/merge_requests/show.html.haml2
1 files changed, 2 insertions, 0 deletions
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