summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-07-06 15:25:05 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-07-06 15:25:05 +0000
commit9274c3c1598f3ff32339e681d5812feeb0f62605 (patch)
tree1bbb4f75277c266185ee5acde4e87f8e1cea5747
parent80da1a51932d64c0fef2ad126feb76986749284b (diff)
parent65c96bfac51f5e15c447f76d8e90aac5b3287bba (diff)
downloadgitlab-ce-9274c3c1598f3ff32339e681d5812feeb0f62605.tar.gz
Merge branch 'repo-limited-width' into 'master'
Limit the file tree view container width Closes #34670 See merge request !12643
-rw-r--r--app/views/projects/tree/show.html.haml5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 3fb247c5ceb..130980556c1 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -5,7 +5,6 @@
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
= render "projects/commits/head"
-= render 'projects/last_push'
-
-%div{ class: container_class }
+%div{ class: [container_class, ("limit-container-width" unless fluid_layout)] }
+ = render 'projects/last_push'
= render 'projects/files', commit: @last_commit, project: @project, ref: @ref