diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-22 11:07:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-22 11:07:25 +0000 |
| commit | 03359bcc3d3100aed54686b60baa91e59101f910 (patch) | |
| tree | c9746f9a14f5d526be655f444ef9abceea9ab840 | |
| parent | 41eea4fd6a73c15b274cdd70b887496ed40c0cb8 (diff) | |
| parent | c65cbffac7fd2b63ecbdd73662e77015abe47785 (diff) | |
| download | gitlab-ce-03359bcc3d3100aed54686b60baa91e59101f910.tar.gz | |
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
| -rw-r--r-- | app/models/repository.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/38234-reserve-refs-replace.yml | 5 |
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 |