summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-09-22 16:18:59 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-09-22 16:43:40 +0800
commitc65cbffac7fd2b63ecbdd73662e77015abe47785 (patch)
tree9b5a3d0973240aba2498a573bd2b22e19fb7c60d
parent26607a1690631916baf5a39d198ff7096cb5bde6 (diff)
downloadgitlab-ce-38234-reserve-refs-replace.tar.gz
Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replace
See: * https://www.kernel.org/pub/software/scm/git/docs/git-replace.html * https://git-scm.com/book/en/v2/Git-Tools-Replace
-rw-r--r--app/models/repository.rb1
-rw-r--r--changelogs/unreleased/38234-reserve-refs-replace.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index f11cf1b065d..90cede9d3d4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -8,6 +8,7 @@ class Repository
RESERVED_REFS_NAMES = %W[
heads
tags
+ replace
#{REF_ENVIRONMENTS}
#{REF_KEEP_AROUND}
#{REF_ENVIRONMENTS}
diff --git a/changelogs/unreleased/38234-reserve-refs-replace.yml b/changelogs/unreleased/38234-reserve-refs-replace.yml
new file mode 100644
index 00000000000..3a5ffbf9db0
--- /dev/null
+++ b/changelogs/unreleased/38234-reserve-refs-replace.yml
@@ -0,0 +1,5 @@
+---
+title: Also reserve refs/replace after importing a project
+merge_request: 14436
+author:
+type: fixed