1. 08 Feb, 2017 1 commit
  2. 06 Feb, 2017 3 commits
    • Rémy Coutable's avatar
      Update gitlab-shell to 3.6.7 · b54b0316
      Rémy Coutable authored
      
      
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      b54b0316
    • Rémy Coutable's avatar
    • Douglas Barbosa Alexandre's avatar
      [8.13 Backport] Merge branch '25301-git-2.11-force-push-bug' into 'master' · daf83fa6
      Douglas Barbosa Alexandre authored
      Accept environment variables from the `pre-receive` script
      
      1. Starting version 2.11, git changed the way the pre-receive flow works.
        - Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next `git gc`.
        - In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted.
      2. In our workflow, the pre-recieve script (in `gitlab-shell`) calls the
         `/allowed` endpoint, which calls out directly to git to perform
         various checks. These direct calls to git do _not_ have the necessary
         environment variables set which allow access to the "alternate object
         directory" (explained above). Therefore these calls to git are not able to
         access any of the new potential objects to be added during this push.
      
      3. We fix this by accepting the relevant environment variables
         (`GIT_ALTERNATE_OBJECT_DIRECTORIES`, `GIT_OBJECT_DIRECTORY`, and
         `GIT_QUARANTINE_PATH`) on the `/allowed` endpoint, and then include
         these environment variables while calling out to git.
      
      4. This commit includes these environment variables while making the "force
         push" check.
      
      See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/120
      
      
      
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      daf83fa6
  3. 21 Jan, 2017 2 commits
  4. 20 Jan, 2017 7 commits
  5. 10 Jan, 2017 3 commits
  6. 09 Jan, 2017 2 commits
  7. 14 Dec, 2016 10 commits
  8. 08 Dec, 2016 4 commits
  9. 07 Dec, 2016 1 commit
  10. 02 Dec, 2016 4 commits
  11. 28 Nov, 2016 2 commits
  12. 25 Nov, 2016 1 commit