diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-08 14:49:28 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-08 14:49:28 +0000 |
commit | 31d6e247041d4bb13aa712dcbbfad10ee5e403b8 (patch) | |
tree | 2d6500c76b7a3d9e67e32c1cff0a849e8965ab32 /changelogs | |
parent | f0453905418dab64a1a53ff67044a5eb8f7aa333 (diff) | |
parent | b54b031638e7a98c1e51b369cff53602db40e4b0 (diff) | |
download | gitlab-ce-31d6e247041d4bb13aa712dcbbfad10ee5e403b8.tar.gz |
Merge branch 'backport-7967-and-8189-to-8-13-stable' into '8-13-stable'
8-13-stable
Backport !7967 and !8189 to `8-13-stable`
See merge request !8991
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/25301-git-2-11-force-push-bug.yml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/use-gitlab-shell-3-6-7.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/25301-git-2-11-force-push-bug.yml b/changelogs/unreleased/25301-git-2-11-force-push-bug.yml new file mode 100644 index 00000000000..afe57729c48 --- /dev/null +++ b/changelogs/unreleased/25301-git-2-11-force-push-bug.yml @@ -0,0 +1,4 @@ +--- +title: Accept environment variables from the `pre-receive` script +merge_request: 7967 +author: diff --git a/changelogs/unreleased/use-gitlab-shell-3-6-7.yml b/changelogs/unreleased/use-gitlab-shell-3-6-7.yml new file mode 100644 index 00000000000..c6600cead87 --- /dev/null +++ b/changelogs/unreleased/use-gitlab-shell-3-6-7.yml @@ -0,0 +1,4 @@ +--- +title: Use gitlab-shell v3.6.7 +merge_request: +author: |