Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cba99501
Commit
cba99501
authored
Oct 20, 2021
by
charlie ablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify error message for clarity
Removes a double negative Changelog: fixed
parent
02ab3b58
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
app/models/namespace.rb
app/models/namespace.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+2
-2
No files found.
app/models/namespace.rb
View file @
cba99501
...
...
@@ -566,7 +566,7 @@ class Namespace < ApplicationRecord
end
if
user_namespace?
errors
.
add
(
:parent_id
,
_
(
'cannot
not
be used for user namespace'
))
errors
.
add
(
:parent_id
,
_
(
'cannot be used for user namespace'
))
elsif
group_namespace?
errors
.
add
(
:parent_id
,
_
(
'user namespace cannot be the parent of another namespace'
))
if
parent
.
user_namespace?
end
...
...
locale/gitlab.pot
View file @
cba99501
...
...
@@ -39862,6 +39862,9 @@ msgstr ""
msgid "cannot be modified"
msgstr ""
msgid "cannot be used for user namespace"
msgstr ""
msgid "cannot block others"
msgstr ""
...
...
@@ -39877,9 +39880,6 @@ msgstr ""
msgid "cannot merge"
msgstr ""
msgid "cannot not be used for user namespace"
msgstr ""
msgid "ciReport|%{degradedNum} degraded"
msgstr ""
...
...
spec/models/namespace_spec.rb
View file @
cba99501
...
...
@@ -50,10 +50,10 @@ RSpec.describe Namespace do
ref
(
:project_sti_name
)
|
ref
(
:user_sti_name
)
|
'project namespace cannot be the parent of another namespace'
ref
(
:project_sti_name
)
|
ref
(
:group_sti_name
)
|
'project namespace cannot be the parent of another namespace'
ref
(
:project_sti_name
)
|
ref
(
:project_sti_name
)
|
'project namespace cannot be the parent of another namespace'
ref
(
:group_sti_name
)
|
ref
(
:user_sti_name
)
|
'cannot
not
be used for user namespace'
ref
(
:group_sti_name
)
|
ref
(
:user_sti_name
)
|
'cannot be used for user namespace'
ref
(
:group_sti_name
)
|
ref
(
:group_sti_name
)
|
nil
ref
(
:group_sti_name
)
|
ref
(
:project_sti_name
)
|
nil
ref
(
:user_sti_name
)
|
ref
(
:user_sti_name
)
|
'cannot
not
be used for user namespace'
ref
(
:user_sti_name
)
|
ref
(
:user_sti_name
)
|
'cannot be used for user namespace'
ref
(
:user_sti_name
)
|
ref
(
:group_sti_name
)
|
'user namespace cannot be the parent of another namespace'
ref
(
:user_sti_name
)
|
ref
(
:project_sti_name
)
|
nil
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment