Merge branch '40335-master-is-broken-due-to-static-analysis' into 'master'

Resolve "`master` is broken due to `static-analysis`" Closes #40335 See merge request gitlab-org/gitlab-ce!15481
2017-11-20 13:15:49 +00:00 · 2017-11-20 13:15:49 +00:00 · 16299d5724
parent 22caa23bb1 0531ccc6fd
commit 16299d5724
1 changed files with 2 additions and 0 deletions
--- a/config/initializers/gollum.rb
+++ b/config/initializers/gollum.rb
@ -21,8 +21,10 @@ module Gollum
        commit = @access.commit(sha)
        tree_map_for(sha).inject([]) do |list, entry|
          next list unless @page_class.valid_page_name?(entry.name)
+
          list << entry.page(self, commit)
          break list if limit && list.size >= limit
+
          list
        end
      else