From 42b8988278bdf9f8c1900b0df435f9550fa576d8 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Thu, 2 Apr 2026 23:40:37 +0000
Subject: [PATCH] Merged r24549 from trunk to 6.1-stable (#43910).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24553 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb     | 4 +++-
 test/unit/project_test.rb | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 89a83b202..94ecf191a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -84,7 +84,9 @@ class Project < ApplicationRecord
   validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/,
                       :if => proc {|p| p.identifier_changed?}
   # reserved words
-  validates_exclusion_of :identifier, :in => %w(new)
+  validates_exclusion_of :identifier,
+                         :in => %w(new autocomplete bulk_destroy),
+                         :if => -> { new_record? || will_save_change_to_identifier? }
   validate :validate_parent
 
   after_update :update_versions_from_hierarchy_change,
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index f8b7e64ed..7a9cf7dc6 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -96,6 +96,8 @@ class ProjectTest < ActiveSupport::TestCase
                "ab-12" => true,
                "ab_12" => true,
                "12" => false,
+               "autocomplete" => false,
+               'bulk_destroy' => false,
                "new" => false}
 
     to_test.each do |identifier, valid|