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
bfc273f8
Commit
bfc273f8
authored
Dec 10, 2020
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix confusing button text when importing from GitHub
parent
f7447302
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
7 deletions
+29
-7
app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
...ties/import_projects/components/import_projects_table.vue
+11
-7
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js
.../import_projects/components/import_projects_table_spec.js
+15
-0
No files found.
app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
View file @
bfc273f8
...
...
@@ -60,13 +60,17 @@ export default {
},
importAllButtonText
()
{
return
this
.
hasIncompatibleRepos
?
n__
(
'
Import %d compatible repository
'
,
'
Import %d compatible repositories
'
,
this
.
importAllCount
,
)
:
n__
(
'
Import %d repository
'
,
'
Import %d repositories
'
,
this
.
importAllCount
);
if
(
this
.
isImportingAnyRepo
)
{
return
__
(
'
Importing...
'
);
}
if
(
this
.
hasIncompatibleRepos
)
return
n__
(
'
Import %d compatible repository
'
,
'
Import %d compatible repositories
'
,
this
.
importAllCount
,
);
return
n__
(
'
Import %d repository
'
,
'
Import %d repositories
'
,
this
.
importAllCount
);
},
emptyStateText
()
{
...
...
locale/gitlab.pot
View file @
bfc273f8
...
...
@@ -14698,6 +14698,9 @@ msgstr ""
msgid "Imported requirements"
msgstr ""
msgid "Importing..."
msgstr ""
msgid "Improve Merge Requests and customer support with GitLab Enterprise Edition."
msgstr ""
...
...
spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js
View file @
bfc273f8
...
...
@@ -142,6 +142,21 @@ describe('ImportProjectsTable', () => {
},
);
it
(
'
sets the button text to "Importing..." when importing repos
'
,
()
=>
{
createComponent
({
state
:
{
providerRepos
:
[
providerRepo
],
},
getters
:
{
hasIncompatibleRepos
:
()
=>
false
,
importAllCount
:
()
=>
10
,
isImportingAnyRepo
:
()
=>
true
,
},
});
expect
(
findImportAllButton
().
text
()).
toBe
(
'
Importing...
'
);
});
it
(
'
renders an empty state if there are no repositories available
'
,
()
=>
{
createComponent
({
state
:
{
repositories
:
[]
}
});
...
...
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