Merge branch 'plus_character_on_repo_name' into 'master'

Allow plus character on Project Name

See merge request gitlab-org/gitlab!67997

doc/development/import_project.md

@@ -111,9 +111,9 @@ public folder (for example `/tmp/`) fixes the issue.
 ##### `Name can contain only letters, digits, emojis ...`
 
 ```plaintext
-Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter,
-digit, emoji or '_'. and Path can contain only letters, digits, '_', '-' and '.'. Cannot start
-with '-', end in '.git' or end in '.atom'
+Name can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. It must start with a letter,
+digit, emoji, or '_', and Path can contain only letters, digits, '_', '-', or '.'. It cannot start
+with '-', end in '.git', or end in '.atom'.
 ```
 
 The project name specified in `project_path` is not valid for one of the specified reasons.

ee/spec/services/projects/update_service_spec.rb

@@ -391,7 +391,7 @@ RSpec.describe Projects::UpdateService, '#execute' do
 
     result = update_project(project, admin, { name: 'foo&bar' })
 
-    expect(result).to eq({ status: :error, message: "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'." })
+    expect(result).to eq({ status: :error, message: "Name can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. It must start with a letter, digit, emoji, or '_'." })
   end
 
   it 'calls remove_import_data if mirror was disabled in previous change' do

lib/gitlab/regex.rb

@@ -220,12 +220,12 @@ module Gitlab
       # The character range \p{Alnum} overlaps with \u{00A9}-\u{1f9ff}
       # hence the Ruby warning.
       # https://gitlab.com/gitlab-org/gitlab/merge_requests/23165#not-easy-fixable
-      @project_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9ff}_][\p{Alnum}\p{Pd}\u{00A9}-\u{1f9ff}_\. ]*\z/.freeze
+      @project_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9ff}_][\p{Alnum}\p{Pd}\u{002B}\u{00A9}-\u{1f9ff}_\. ]*\z/.freeze
     end
 
     def project_name_regex_message
-      "can contain only letters, digits, emojis, '_', '.', dash, space. " \
-      "It must start with letter, digit, emoji or '_'."
+      "can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. " \
+      "It must start with a letter, digit, emoji, or '_'."
     end
 
     def group_name_regex

spec/lib/gitlab/regex_spec.rb

@@ -12,22 +12,29 @@ RSpec.describe Gitlab::Regex do
     it { is_expected.to match('Dash – is this') }
   end
 
-  shared_examples_for 'project/group name regex' do
+  shared_examples_for 'group name regex' do
     it_behaves_like 'project/group name chars regex'
     it { is_expected.not_to match('?gitlab') }
     it { is_expected.not_to match("Users's something") }
   end
 
+  shared_examples_for 'project name regex' do
+    it_behaves_like 'project/group name chars regex'
+    it { is_expected.to match("Gitlab++") }
+    it { is_expected.not_to match('?gitlab') }
+    it { is_expected.not_to match("Users's something") }
+  end
+
   describe '.project_name_regex' do
     subject { described_class.project_name_regex }
 
-    it_behaves_like 'project/group name regex'
+    it_behaves_like 'project name regex'
   end
 
   describe '.group_name_regex' do
     subject { described_class.group_name_regex }
 
-    it_behaves_like 'project/group name regex'
+    it_behaves_like 'group name regex'
 
     it 'allows parenthesis' do
       is_expected.to match('Group One (Test)')
@@ -51,7 +58,7 @@ RSpec.describe Gitlab::Regex do
   describe '.project_name_regex_message' do
     subject { described_class.project_name_regex_message }
 
-    it { is_expected.to eq("can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'.") }
+    it { is_expected.to eq("can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. It must start with a letter, digit, emoji, or '_'.") }
   end
 
   describe '.group_name_regex_message' do

spec/services/projects/update_service_spec.rb

@@ -374,7 +374,7 @@ RSpec.describe Projects::UpdateService do
 
         expect(result).to eq({
           status: :error,
-          message: "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'."
+          message: "Name can contain only letters, digits, emojis, '_', '.', '+', dashes, or spaces. It must start with a letter, digit, emoji, or '_'."
         })
       end
     end