diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-20 13:15:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-20 13:15:49 +0000 |
| commit | 16299d5724d7695c6ed27da6ac5321a34737a7cd (patch) | |
| tree | 1dc3857d9e09c251711c95516dee975bdbc0a000 | |
| parent | 22caa23bb1b9e46a568aeab66ed52fde6cc85d3d (diff) | |
| parent | 0531ccc6fddbe8290c0bb83f6ea8e61a1d6e753c (diff) | |
| download | gitlab-ce-16299d5724d7695c6ed27da6ac5321a34737a7cd.tar.gz | |
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
| -rw-r--r-- | config/initializers/gollum.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb index 2ca32791bb1..2fd47a3f4d3 100644 --- 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 |