1. 23 Aug, 2018 1 commit
    • Kirill Smelkov's avatar
      There is no need to keep old hooks around - remove them · 64603b4d
      Kirill Smelkov authored
      [ Sent upstream: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/40
      
        This was filed upstream but decided the better way to go is to
        configure default git templates to be just empty.
      
        Until we implement that, we continue to carry this patch as NXD ]
      
      gitlab-shell uses completely own whole set of git hooks and just
      symlinks repo.git/hooks to path/to/gitlab-shell/hooks/.
      
      Original hooks that git added there - when initializing repository -
      from its template, and which are by default deactivated, are currently
      moved to repos.git/hooks.old.<timestamp>, e.g.
      
      $ ls -F nexedi/helloweb.git/
          config
          description
          HEAD
          hooks@                  -->  ...path/to/gitlab-shell/hooks/
          hooks.old.1446564288/
          info/
          packed-refs
          refs/
      
      $ ls -F nexedi/helloweb.git/hooks.old.1446564288/
          applypatch-msg.sample*
          post-update.sample*
          pre-commit.sample*
          pre-push.sample*
          update.sample*
          commit-msg.sample*
          pre-applypatch.sample*
          prepare-commit-msg.sample*
          pre-rebase.sample*
      
      On the other hand, hooks.old.<timestamp> are not used anywhere and are
      left there "just in case". But what is the point to keep those pristine
      samples git creates by default? And we are sure those files are always
      results of gitlab-shell initializing a repository, as it is
      gitlab-shell's job to create/remove/update/etc repositories.
      
      So do not keep old hooks, remove them.
      
      P.S. The patch that introduced whole-hooks-dir-symlinking is
          db81327b (Symlink the whole hooks directory).
      
      /cc @dzaporozhets, @jacobvosmaer
      64603b4d
  2. 16 Dec, 2016 3 commits
    • Rémy Coutable's avatar
      Merge branch '25301-git-2.11-force-push-bug' into 'master' · a3712cc1
      Rémy Coutable authored
      Pass relevant git environment variables while calling `/allowed`
      
      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 calls the `/allowed` endpoint on the
         rails server. This `/allowed` endpoint 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 passing the relevant environment variables
         (`GIT_ALTERNATE_OBJECT_DIRECTORIES`, `GIT_OBJECT_DIRECTORY`, and
         `GIT_QUARANTINE_PATH`) to the `/allowed` endpoint, which will then include
         these environment variables while calling out to git.
      
      ---
      
      - Related to gitlab-org/gitlab-ce#25301. 
      - Corresponding backend MR: gitlab-org/gitlab-ce!7967
      - Corresponding EE MR: gitlab-org/gitlab-ee!964
      
      See merge request !112
      a3712cc1
    • Timothy Andrew's avatar
      Add CHANGELOG entry. · b72ee519
      Timothy Andrew authored
      b72ee519
    • Timothy Andrew's avatar
      Pass relevant git environment variables while calling `/allowed` · fc201648
      Timothy Andrew authored
      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 calls the `/allowed` endpoint on the
         rails server. This `/allowed` endpoint 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 passing the relevant environment variables
         (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and
         GIT_QUARANTINE_PATH) to the `/allowed` endpoint, which will then include
         these environment variables while calling out to git.
      fc201648
  3. 12 Dec, 2016 3 commits
  4. 09 Dec, 2016 1 commit
  5. 08 Dec, 2016 1 commit
  6. 06 Dec, 2016 1 commit
  7. 01 Dec, 2016 23 commits
  8. 30 Nov, 2016 1 commit
  9. 17 Nov, 2016 2 commits
  10. 16 Nov, 2016 4 commits