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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
702440ee
Commit
702440ee
authored
Jun 26, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💬
improve text in error message
parent
6157cd29
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/ide/stores/actions/project.js
app/assets/javascripts/ide/stores/actions/project.js
+3
-3
No files found.
app/assets/javascripts/ide/stores/actions/project.js
View file @
702440ee
...
@@ -97,7 +97,7 @@ export const createNewBranchFromDefault = ({ state, getters }, branch) =>
...
@@ -97,7 +97,7 @@ export const createNewBranchFromDefault = ({ state, getters }, branch) =>
branch
,
branch
,
})
})
.
then
(()
=>
{
.
then
(()
=>
{
location
.
reload
();
window
.
location
.
reload
();
// this forces the loading icon to spin whilst the page is reloading
// this forces the loading icon to spin whilst the page is reloading
return
new
Promise
(()
=>
{});
return
new
Promise
(()
=>
{});
...
@@ -107,14 +107,14 @@ export const createNewBranchFromDefault = ({ state, getters }, branch) =>
...
@@ -107,14 +107,14 @@ export const createNewBranchFromDefault = ({ state, getters }, branch) =>
export
const
showBranchNotFoundError
=
({
dispatch
},
branchId
)
=>
{
export
const
showBranchNotFoundError
=
({
dispatch
},
branchId
)
=>
{
dispatch
(
'
setErrorMessage
'
,
{
dispatch
(
'
setErrorMessage
'
,
{
text
:
sprintf
(
text
:
sprintf
(
__
(
'
Branch %{branchName} was not found in project.
'
),
__
(
"
Branch %{branchName} was not found in project's repository.
"
),
{
{
branchName
:
`<strong>
${
_
.
escape
(
branchId
)}
</strong>`
,
branchName
:
`<strong>
${
_
.
escape
(
branchId
)}
</strong>`
,
},
},
false
,
false
,
),
),
action
:
'
createNewBranchFromDefault
'
,
action
:
'
createNewBranchFromDefault
'
,
actionText
:
'
Create branch
'
,
actionText
:
__
(
'
Create branch
'
)
,
actionPayload
:
branchId
,
actionPayload
:
branchId
,
});
});
};
};
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