1. 07 Jan, 2018 3 commits
    • Marin Jankovski's avatar
      Merge branch '10-4-templates-update' into 'master' · 4ddc5dba
      Marin Jankovski authored
      10.4 templates update
      
      Closes #10
      
      See merge request gitlab-org/gitlab-ce!16266
      4ddc5dba
    • Marin Jankovski's avatar
      Merge branch 'sh-fix-issue-41735' into 'master' · 59b11c3d
      Marin Jankovski authored
      Fix error 500 when viewing commit and merge request diffs
      
      Closes #41735
      
      See merge request gitlab-org/gitlab-ce!16272
      59b11c3d
    • Stan Hu's avatar
      Fix error 500 when viewing commit and merge request diffs · c2b7147c
      Stan Hu authored
      Due to the refactoring in !16082, `Blob#batch` no longer falls back
      to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
      a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
      method.
      
      This fix here is to be consistent and use a non-nil default value in
      `Repository#batch_blobs`.
      
      The problem was masked in development and tests because Gitaly is always
      enabled by default for all features.
      
      Closes #41735
      c2b7147c
  2. 06 Jan, 2018 8 commits
  3. 05 Jan, 2018 29 commits