diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-24 13:58:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-24 13:58:29 +0000 |
| commit | d27039d14b80998f06f9da697693fcc93611c6e3 (patch) | |
| tree | 69c7218d482aeb9dc36c039fb45a139a7ce06846 | |
| parent | bf4e97fc8386fd941ea316902d4bce07c2a177b2 (diff) | |
| parent | a280c6871c3e39336d6f7e2e33a1e948c3e8a2cc (diff) | |
| download | gitlab-ce-d27039d14b80998f06f9da697693fcc93611c6e3.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/bvl-dont-rename-free-names.yml | 5 | ||||
| -rw-r--r-- | db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/changelogs/unreleased/bvl-dont-rename-free-names.yml b/changelogs/unreleased/bvl-dont-rename-free-names.yml new file mode 100644 index 00000000000..60a4ec8afbe --- /dev/null +++ b/changelogs/unreleased/bvl-dont-rename-free-names.yml @@ -0,0 +1,5 @@ +--- +title: Don't rename paths that were freed up when upgrading +merge_request: 15029 +author: +type: fixed diff --git a/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb b/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb index 9441b236c8d..2125cc046e5 100644 --- a/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb +++ b/db/post_migrate/20170525140254_rename_all_reserved_paths_again.rb @@ -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 |