1. 21 Nov, 2017 5 commits
    • Stan Hu's avatar
      Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master' · aee043ebf088
      Stan Hu authored
      ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`
      
      Closes #40291
      
      See merge request gitlab-org/gitlab-ce!15520
      
      (cherry picked from commit b462edfddbd8e8b4449a6ae8cf482a9255f5d550)
      
      Conflicts:
      	lib/tasks/gitlab/cleanup.rake
      aee043ebf088
    • Stan Hu's avatar
      Merge branch '10-2-hashed-storage-file-uploader' into 'master' · 759d6dde0736
      Stan Hu authored
      FileUploader should use Hashed Storage only when project is migrated
      
      See merge request gitlab-org/gitlab-ce!15526
      
      (cherry picked from commit c63c41afca6d184d22283c2b4f4363bb1ddaaf89)
      
      d0f6b0a7f551 FileUploader should check for hashed_storage?(:attachments) to use disk_path
      759d6dde0736
    • Douwe Maan's avatar
      Merge branch 'sh-optimize-read-only-check' into 'master' · 0108b52b8529
      Douwe Maan authored
      Optimize read-only middleware so that it does not consume as much CPU
      
      Closes #40185 and gitlab-com/infrastructure#3240
      
      See merge request gitlab-org/gitlab-ce!15504
      
      (cherry picked from commit 6c3398165469de7890cd7881b175858f7c6be8e5)
      
      3c52e2f0 Optimize read-only middleware so that it does not consume as much CPU
      cba68d33 use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
      91075c82 check for `read_only?` first before seeing if request is disallowed
      aeb2f49f Revert "check for `read_only?` first before seeing if request is disallowed"
      0108b52b8529
    • Stan Hu's avatar
      Merge branch 'opt-in-gitaly' into '10-2-stable' · 7fc3fe6abfae
      Stan Hu authored
      Opt in gitaly
      
      See merge request gitlab-org/gitlab-ce!15522
      7fc3fe6abfae
    • Alejandro Rodríguez's avatar
      Mark all gitaly features as opt-in · 3bdd905b6c2b
      Alejandro Rodríguez authored
      3bdd905b6c2b
  2. 20 Nov, 2017 5 commits
    • Winnie Hellmann's avatar
      Update VERSION to 10.2.0-rc4 · 06d6c694ba83
      Winnie Hellmann authored
      06d6c694ba83
    • Douwe Maan's avatar
      Merge branch 'fix-conflict-highlighting' into 'master' · 370cbbdf8713
      Douwe Maan authored
      Fix conflict highlighting
      
      See merge request gitlab-org/gitlab-ce!15463
      
      (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b)
      
      64a9e53b Fix conflict highlighting
      370cbbdf8713
    • Rémy Coutable's avatar
      Merge branch... · 67ec6408088e
      Rémy Coutable authored
      Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master'
      
      Fix Gitlab::Git::Repository#remote_tags using unexisting variable
      
      Closes #40300
      
      See merge request gitlab-org/gitlab-ce!15466
      
      (cherry picked from commit c563661f910934f1103690d46f9af8a75423077d)
      
      63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable
      d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
      67ec6408088e
    • Douwe Maan's avatar
      Merge branch 'bvl-fix-count-with-selects' into 'master' · 385d6af5e099
      Douwe Maan authored
      Remove the selects when counting the last page
      
      Closes #40266
      
      See merge request gitlab-org/gitlab-ce!15456
      
      (cherry picked from commit c406824d319e5b1a073af7cf55c3f24bfa66e2a4)
      
      5a335c4d Remove the selects when counting the last page
      385d6af5e099
    • Stan Hu's avatar
      Merge branch '4056-hashed-storage-upload-transfers' into 'master' · a637ca3d7a01
      Stan Hu authored
      Fix project transfer with hashed-storage attachments
      
      Closes gitlab-ee#4056
      
      See merge request gitlab-org/gitlab-ce!15457
      
      (cherry picked from commit 121508f81fec8773af37a345abb6c33b7a3c4518)
      
      9b3b0f02 Fix project transfer with hashed-storage attachments
      a637ca3d7a01
  3. 17 Nov, 2017 17 commits
  4. 16 Nov, 2017 3 commits
  5. 15 Nov, 2017 10 commits