summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-11 14:26:36 -0500
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-11 14:27:06 -0500
commitde7798df319e09c87a6b833934f5e400185ec18d (patch)
tree4ddd1b005f836e2f748fe71e1192900d702599cb
parent87edaecaff14a443615d5905829f7abe52535a13 (diff)
downloadgitlab-ce-12557-tree-content.tar.gz
Moves method to TreeHelper12557-tree-content
Reuses existing TreeHelper instead of creating a new one just for one method.
-rw-r--r--app/helpers/tree_content_helper.rb9
-rw-r--r--app/helpers/tree_helper.rb7
2 files changed, 7 insertions, 9 deletions
diff --git a/app/helpers/tree_content_helper.rb b/app/helpers/tree_content_helper.rb
deleted file mode 100644
index 2b964569db6..00000000000
--- a/app/helpers/tree_content_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module TreeContentHelper
- def tree_content_data(logs_path)
- {
- "logs-path" => logs_path
- }
- end
-end
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 4690b6ffbe1..a3575462de0 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -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