Merge branch '38234-reserve-refs-replace' into 'master'

Reserve refs/replace because `git-replace` is using it Closes #38234 See merge request gitlab-org/gitlab-ce!14436
2017-09-22 11:07:25 +00:00 · 2017-09-22 11:07:25 +00:00 · 03359bcc3d
parent 41eea4fd6a c65cbffac7
commit 03359bcc3d
2 changed files with 6 additions and 0 deletions
--- 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}
--- a/changelogs/unreleased/38234-reserve-refs-replace.yml
+++ 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