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
06157e05
Commit
06157e05
authored
Mar 22, 2022
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address reviewer comments
* switch from gon to provide
parent
59b84720
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
8 deletions
+14
-8
app/assets/javascripts/pages/import/history/components/import_history_app.vue
...ts/pages/import/history/components/import_history_app.vue
+3
-3
app/assets/javascripts/pages/import/history/index.js
app/assets/javascripts/pages/import/history/index.js
+6
-0
app/views/import/history/index.html.haml
app/views/import/history/index.html.haml
+1
-1
spec/frontend/pages/import/history/components/import_error_details_spec.js
...es/import/history/components/import_error_details_spec.js
+0
-0
spec/frontend/pages/import/history/components/import_history_app_spec.js
...ages/import/history/components/import_history_app_spec.js
+4
-4
No files found.
app/assets/javascripts/pages/import/history/components/import_history_app.vue
View file @
06157e05
...
...
@@ -39,6 +39,8 @@ export default {
TimeAgo
,
},
inject
:
[
'
assets
'
],
data
()
{
return
{
loading
:
true
,
...
...
@@ -122,8 +124,6 @@ export default {
this
.
paginationConfig
.
page
=
1
;
},
},
gitlabLogo
:
window
.
gon
.
gitlab_logo
,
};
</
script
>
...
...
@@ -133,7 +133,7 @@ export default {
class=
"gl-border-solid gl-border-gray-200 gl-border-0 gl-border-b-1 gl-display-flex gl-align-items-center"
>
<h1
class=
"gl-my-0 gl-py-4 gl-font-size-h1"
>
<img
:src=
"
$option
s.gitlabLogo"
class=
"gl-w-6 gl-h-6 gl-mb-2 gl-display-inline gl-mr-2"
/>
<img
:src=
"
asset
s.gitlabLogo"
class=
"gl-w-6 gl-h-6 gl-mb-2 gl-display-inline gl-mr-2"
/>
{{
s__
(
'
BulkImport|Project import history
'
)
}}
</h1>
</div>
...
...
app/assets/javascripts/pages/import/history/index.js
View file @
06157e05
...
...
@@ -6,6 +6,12 @@ function mountImportHistoryApp(mountElement) {
return
new
Vue
({
el
:
mountElement
,
name
:
'
ImportHistoryRoot
'
,
provide
:
{
assets
:
{
gitlabLogo
:
mountElement
.
dataset
.
logo
,
},
},
render
(
createElement
)
{
return
createElement
(
ImportHistoryApp
);
},
...
...
app/views/import/history/index.html.haml
View file @
06157e05
-
add_to_breadcrumbs
_
(
'Create a new project'
),
new_project_path
-
page_title
_
(
'Import history'
)
#import-history-mount-element
#import-history-mount-element
{
data:
{
logo:
asset_url
(
'gitlab_logo.png'
)
}
}
spec/frontend/pages/import/history/import_error_details_spec.js
→
spec/frontend/pages/import/history/
components/
import_error_details_spec.js
View file @
06157e05
File moved
spec/frontend/pages/import/history/import_history_app_spec.js
→
spec/frontend/pages/import/history/
components/
import_history_app_spec.js
View file @
06157e05
...
...
@@ -52,10 +52,10 @@ describe('ImportHistoryApp', () => {
function
createComponent
({
shallow
=
true
}
=
{})
{
const
mountFn
=
shallow
?
shallowMount
:
mount
;
wrapper
=
mountFn
(
ImportHistoryApp
,
s
hallow
?
{
stubs
:
{
GlTable
:
{
...
stubComponent
(
GlTable
),
props
:
[
'
items
'
]
}
}
}
:
{},
);
wrapper
=
mountFn
(
ImportHistoryApp
,
{
provide
:
{
assets
:
{
gitlabLogo
:
'
http://dummy.host
'
}
}
,
s
tubs
:
shallow
?
{
GlTable
:
{
...
stubComponent
(
GlTable
),
props
:
[
'
items
'
]
}
}
:
{},
}
);
}
const
originalApiVersion
=
gon
.
api_version
;
...
...
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