Commit d50125a0 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '12557-tree-content' into 'master'

Move EE differences for `app/views/projects/tree/_tree_content.html.haml`

Closes gitlab-ee#12557

See merge request gitlab-org/gitlab-ce!30455
parents 410a506c 26faaa77
Pipeline #70597975 passed with stages
in 32 minutes and 58 seconds
......@@ -147,4 +147,11 @@ module TreeHelper
def relative_url_root
Gitlab.config.gitlab.relative_url_root.presence || '/'
end
# project and path are used on the EE version
def tree_content_data(logs_path, project, path)
{
"logs-path" => logs_path
}
end
end
.tree-content-holder.js-tree-content{ 'data-logs-path': @logs_path }
.tree-content-holder.js-tree-content{ data: tree_content_data(@logs_path, @project, @path) }
.table-holder.bordered-box
%table.table#tree-slider{ class: "table_#{@hex_path} tree-table qa-file-tree" }
%thead
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment