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

Merge branch '38234-reserve-refs-replace' into 'master'
03359bcc · Rémy Coutable · 41eea4fd · c65cbffa · 03359bcc · 03359bcc
Commit 03359bcc authored Sep 22, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

repository.rb app/models/repository.rb +1 -0

38234-reserve-refs-replace.yml changelogs/unreleased/38234-reserve-refs-replace.yml +5 -0

No files found.
--- 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
+---
+title: Also reserve refs/replace after importing a project
+merge_request: 14436
+author:
+type: fixed