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
1d45ae6f
Commit
1d45ae6f
authored
May 27, 2021
by
jerasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve fork error message
Improved the error message when forking a project. Changelog: changed
parent
13c7ec0d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue
...scripts/pages/projects/forks/new/components/fork_form.vue
+5
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/pages/projects/forks/new/components/fork_form_spec.js
...end/pages/projects/forks/new/components/fork_form_spec.js
+1
-1
No files found.
app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue
View file @
1d45ae6f
...
@@ -222,7 +222,11 @@ export default {
...
@@ -222,7 +222,11 @@ export default {
redirectTo
(
data
.
web_url
);
redirectTo
(
data
.
web_url
);
return
;
return
;
}
catch
(
error
)
{
}
catch
(
error
)
{
createFlash
({
message
:
error
});
createFlash
({
message
:
s__
(
'
ForkProject|An error occurred while forking the project. Please try again.
'
,
),
});
}
}
},
},
},
},
...
...
locale/gitlab.pot
View file @
1d45ae6f
...
@@ -14332,6 +14332,9 @@ msgstr ""
...
@@ -14332,6 +14332,9 @@ msgstr ""
msgid "ForkProject|A fork is a copy of a project."
msgid "ForkProject|A fork is a copy of a project."
msgstr ""
msgstr ""
msgid "ForkProject|An error occurred while forking the project. Please try again."
msgstr ""
msgid "ForkProject|Cancel"
msgid "ForkProject|Cancel"
msgstr ""
msgstr ""
...
...
spec/frontend/pages/projects/forks/new/components/fork_form_spec.js
View file @
1d45ae6f
...
@@ -356,7 +356,7 @@ describe('ForkForm component', () => {
...
@@ -356,7 +356,7 @@ describe('ForkForm component', () => {
expect
(
urlUtility
.
redirectTo
).
not
.
toHaveBeenCalled
();
expect
(
urlUtility
.
redirectTo
).
not
.
toHaveBeenCalled
();
expect
(
createFlash
).
toHaveBeenCalledWith
({
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
dummyError
,
message
:
'
An error occurred while forking the project. Please try again.
'
,
});
});
});
});
});
});
...
...
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