diff --git a/lib/gitlab/string_path.rb b/lib/gitlab/string_path.rb
index 493fceb256..1eb8162f80 100644
--- a/lib/gitlab/string_path.rb
+++ b/lib/gitlab/string_path.rb
@@ -5,15 +5,15 @@ module Gitlab
   # This is IO-operations safe class, that does similar job to 
   # Ruby's Pathname but without the risk of accessing filesystem.
   #
-  # TODO: better support for './' and '../'
+  # TODO: better support for '../' and './'
   #
   class StringPath
     attr_reader :path, :universe
 
     def initialize(path, universe)
       @path = prepare(path)
-      @universe = universe.map { |entry| prepare(entry) }
-      @universe.unshift('./') unless @universe.include?('./')
+      @universe = Set.new(universe.map { |entry| prepare(entry) })
+      @universe.add('./')
     end
 
     def to_s
@@ -64,7 +64,10 @@ module Gitlab
     end
 
     def children
-      descendants.select { |descendant| descendant.parent == self }
+      return [] unless directory?
+      return @children if @children
+      children = @universe.select { |entry| entry =~ %r{^#{@path}[^/]+/?$} }
+      @children = children.map { |path| new(path) }
     end
 
     def directories
@@ -85,6 +88,10 @@ module Gitlab
       @path == other.path && @universe == other.universe
     end
 
+    def inspect
+      "#{self.class.name}: #{@path}"
+    end
+
     private
 
     def new(path)