summaryrefslogtreecommitdiff
path: root/app/views/projects/_files.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-21 18:07:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-21 18:07:57 +0000
commitc0b718a0dbd99e6c0d30e5bc55bdcf4a12946375 (patch)
tree8ad3691912d91d8cf7b3931f68a4284ae7b5995c /app/views/projects/_files.html.haml
parent5dc70663c4ff1feb215428ce50673b5b646f9809 (diff)
downloadgitlab-ce-c0b718a0dbd99e6c0d30e5bc55bdcf4a12946375.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_files.html.haml')
-rw-r--r--app/views/projects/_files.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml
index 51222784847..8bf397d0796 100644
--- a/app/views/projects/_files.html.haml
+++ b/app/views/projects/_files.html.haml
@@ -10,6 +10,9 @@
.nav-block.gl-display-flex.gl-xs-flex-direction-column.gl-align-items-stretch
= render 'projects/tree/tree_header', tree: @tree, is_project_overview: is_project_overview
+ - if project.forked? && Feature.enabled?(:fork_divergence_counts, @project.fork_source)
+ = render 'projects/fork_info'
+
.info-well.gl-display-none.gl-sm-display-flex.project-last-commit.gl-flex-direction-column
#js-last-commit.gl-m-auto
= gl_loading_icon(size: 'md')