diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 13:25:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 13:25:33 +0000 |
| commit | c1a8cffe7e0769d28be3e03aba938069d29c8902 (patch) | |
| tree | 35399d5aa952fd9207233b569540b98af484eaac | |
| parent | 28299de189c4c1e9c900d68f98ecfac993cb0aed (diff) | |
| parent | 9adbd14811a67ce1b0f6b556c685c99d5fc0489e (diff) | |
| download | gitlab-ce-c1a8cffe7e0769d28be3e03aba938069d29c8902.tar.gz | |
Merge branch 'remove-tree-holder' into 'master'
Remove unused #tree-holder
Closes #36035
See merge request !13338
| -rw-r--r-- | app/views/projects/_files.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/artifacts/file.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml index 426085b3e1c..398d9306bed 100644 --- a/app/views/projects/_files.html.haml +++ b/app/views/projects/_files.html.haml @@ -1,7 +1,7 @@ - commit = local_assigns.fetch(:commit) { @repository.commit } - ref = local_assigns.fetch(:ref) { current_ref } - project = local_assigns.fetch(:project) { @project } -#tree-holder.tree-holder.clearfix +.tree-holder.clearfix .nav-block = render 'projects/tree/tree_header', tree: @tree diff --git a/app/views/projects/artifacts/file.html.haml b/app/views/projects/artifacts/file.html.haml index 18e86ac5a92..b85bbcb980e 100644 --- a/app/views/projects/artifacts/file.html.haml +++ b/app/views/projects/artifacts/file.html.haml @@ -3,7 +3,7 @@ = render "projects/jobs/header", show_controls: false -#tree-holder.tree-holder +.tree-holder .nav-block %ul.breadcrumb.repo-breadcrumb %li diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index 7dd834e84b5..278f4201bba 100644 --- a/app/views/projects/blob/show.html.haml +++ b/app/views/projects/blob/show.html.haml @@ -10,7 +10,7 @@ = render 'projects/last_push' %div{ class: container_class } - #tree-holder.tree-holder + .tree-holder = render 'blob', blob: @blob - if can_modify_blob?(@blob) |