1. 09 Nov, 2017 4 commits
    • Sean McGivern's avatar
      Fix access to the final page of todos · acf49c6d
      Sean McGivern authored
      The todos page limit is 20, and both that and a user's pending todo count are
      integers. Using integer division means that the result's floor will be taken,
      defeating the point of the later call to `#ceil`.
      
      So we need to convert one side of the division to a float first, otherwise the
      last page won't be treated as available.
      acf49c6d
    • Douwe Maan's avatar
      Merge branch 'github-rake-task-rate-limiting' into 'master' · 760b2c75
      Douwe Maan authored
      Add GitHub enterprise support to the GitHub Rake task and better handle rate limiting being disabled
      
      See merge request gitlab-org/gitlab-ce!15284
      760b2c75
    • Douwe Maan's avatar
      Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable' · 20ac30a7
      Douwe Maan authored
      Include X-Content-Type-Options (XCTO) header into API responses
      
      See merge request gitlab/gitlabhq!2211
      
      (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79)
      
      e087e075 Include X-Content-Type-Options (XCTO) header into API responses
      20ac30a7
    • Douwe Maan's avatar
      Merge branch 'ssrf-protections-round-2' into 'security-10-1' · 89bd7835
      Douwe Maan authored
      Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
      
      See merge request gitlab/gitlabhq!2219
      
      (cherry picked from commit 4a1e73783d5480aa514db7b53e10c075f95580b5)
      
      1bffa0c3 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
      89bd7835
  2. 08 Nov, 2017 36 commits