Merge branch 'bvl-dont-rename-free-names' into 'master'

Don't rename groups/projects that aren't reserved anymore

Closes #39387

See merge request gitlab-org/gitlab-ce!15029
This commit is contained in:
Douwe Maan 2017-10-24 13:58:29 +00:00
commit d27039d14b
2 changed files with 5 additions and 11 deletions

View file

@ -0,0 +1,5 @@
---
title: Don't rename paths that were freed up when upgrading
merge_request: 15029
author:
type: fixed

View file

@ -13,7 +13,6 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
.well-known
abuse_reports
admin
all
api
assets
autocomplete
@ -24,29 +23,20 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
groups
health_check
help
hooks
import
invites
issues
jwt
koding
member
merge_requests
new
notes
notification_settings
oauth
profile
projects
public
repository
robots.txt
s
search
sent_notifications
services
snippets
teams
u
unicorn_test
unsubscribes
@ -94,7 +84,6 @@ class RenameAllReservedPathsAgain < ActiveRecord::Migration
notification_setting
pipeline_quota
projects
subgroups
].freeze
def up