<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-shell.git, branch http-excon</title>
<subtitle>gitlab.com: gitlab-org/gitlab-shell.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/'/>
<entry>
<title>WIP Use excon for HTTP requests</title>
<updated>2017-01-02T17:59:07+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>jacob@gitlab.com</email>
</author>
<published>2017-01-02T17:59:07+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=d03e022b8816fd4193ff7a0a34e35573e8114e7f'/>
<id>d03e022b8816fd4193ff7a0a34e35573e8114e7f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Vendor redis_rb from Rubygems, not GitHub</title>
<updated>2017-01-02T15:29:14+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>jacob@gitlab.com</email>
</author>
<published>2017-01-02T15:12:06+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=3fe9cea03a6384fd8f57f10e172c134ed5c0552d'/>
<id>3fe9cea03a6384fd8f57f10e172c134ed5c0552d</id>
<content type='text'>
Also just include the entire gem. Space used is negligible and this
way we don't have to think about what to leave in/out.

Create a vendor-gem script in Ruby instead of Make.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Also just include the entire gem. Space used is negligible and this
way we don't have to think about what to leave in/out.

Create a vendor-gem script in Ruby instead of Make.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '25301-git-2.11-force-push-bug' into 'master'</title>
<updated>2016-12-16T13:22:23+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-16T13:22:23+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=a3712cc18de8283b25c3a8a034ecc8c9b7feca48'/>
<id>a3712cc18de8283b25c3a8a034ecc8c9b7feca48</id>
<content type='text'>

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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

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</pre>
</div>
</content>
</entry>
<entry>
<title>Add CHANGELOG entry.</title>
<updated>2016-12-16T04:09:25+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-12-16T04:07:20+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=b72ee519879d6d039f788635a21d5437fdde28d0'/>
<id>b72ee519879d6d039f788635a21d5437fdde28d0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Pass relevant git environment variables while calling `/allowed`</title>
<updated>2016-12-16T04:09:12+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-12-07T07:39:47+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=fc2016484aacb82980c1c9082e195110f0eacb34'/>
<id>fc2016484aacb82980c1c9082e195110f0eacb34</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'make-custom-hook-dir-configurable' into 'master'</title>
<updated>2016-12-12T15:09:20+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-12T15:09:20+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=92dad7c1855666cb0755ee1f9f6f1910c903fb92'/>
<id>92dad7c1855666cb0755ee1f9f6f1910c903fb92</id>
<content type='text'>

Make custom hook dir configurable

Add a new configuration option, custom_hook_dir. When this is set, we
will look for global custom hooks in: `&lt;custom_hook_dir&gt;/{pre-receive,update,post-receive}.d/*`

When this is not set, default to `&lt;ROOT_PATH&gt;/hooks`.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1754 and
gitlab-org/gitlab-ce!8040.

See merge request !113</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make custom hook dir configurable

Add a new configuration option, custom_hook_dir. When this is set, we
will look for global custom hooks in: `&lt;custom_hook_dir&gt;/{pre-receive,update,post-receive}.d/*`

When this is not set, default to `&lt;ROOT_PATH&gt;/hooks`.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1754 and
gitlab-org/gitlab-ce!8040.

See merge request !113</pre>
</div>
</content>
</entry>
<entry>
<title>Update VERSION to 4.1.0</title>
<updated>2016-12-12T13:31:19+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-12-12T13:31:19+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=bf21f6eeef482c71a5ff2b3d26da048ac236b075'/>
<id>bf21f6eeef482c71a5ff2b3d26da048ac236b075</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Make custom hooks dir configurable</title>
<updated>2016-12-12T13:21:42+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-12-09T12:52:26+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=fbc213eabdbb76ec846357d980705f5d4f20ecc5'/>
<id>fbc213eabdbb76ec846357d980705f5d4f20ecc5</id>
<content type='text'>
Add a new configuration option, custom_hooks_dir. When this is set, we
will look for global custom hooks in:
    &lt;custom_hooks_dir&gt;/{pre-receive,update,post-receive}.d/*

When this is not set, default to &lt;REPO_PATH&gt;/hooks.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add a new configuration option, custom_hooks_dir. When this is set, we
will look for global custom hooks in:
    &lt;custom_hooks_dir&gt;/{pre-receive,update,post-receive}.d/*

When this is not set, default to &lt;REPO_PATH&gt;/hooks.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '21451-change-merge-request-text-after-pushing-new-branch' into 'master'</title>
<updated>2016-12-09T10:27:51+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-09T10:27:51+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=8e370b37e16dc8eebeca264c6c351dc4a4fdab4a'/>
<id>8e370b37e16dc8eebeca264c6c351dc4a4fdab4a</id>
<content type='text'>

Make merge request text after push clearer

The message to create a merge request after pushing a new branch was not clear. It is now clear that it is optional to create a merge request for the pushed branch.

Part of [#21451](https://gitlab.com/gitlab-org/gitlab-ce/issues/21451)

See merge request !109</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make merge request text after push clearer

The message to create a merge request after pushing a new branch was not clear. It is now clear that it is optional to create a merge request for the pushed branch.

Part of [#21451](https://gitlab.com/gitlab-org/gitlab-ce/issues/21451)

See merge request !109</pre>
</div>
</content>
</entry>
<entry>
<title>Make merge request text after push clearer</title>
<updated>2016-12-08T21:29:29+00:00</updated>
<author>
<name>Lisanne Fellinger</name>
<email>lisanne.88@gmail.com</email>
</author>
<published>2016-11-28T14:50:01+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-shell.git/commit/?id=ed37021cc296f4b3dda0d933c3b25cf212a29e5c'/>
<id>ed37021cc296f4b3dda0d933c3b25cf212a29e5c</id>
<content type='text'>
Add changelog entry

Editing changelog entry version
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add changelog entry

Editing changelog entry version
</pre>
</div>
</content>
</entry>
</feed>
