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
e1038ea3
Commit
e1038ea3
authored
Sep 11, 2020
by
Gilang Gumilar
Committed by
Simon Knox
Sep 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate '.fa-spinner' to '.spinner' for 'app/views/imports'
parent
4a78ec9f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/import/_project_status.html.haml
app/views/import/_project_status.html.haml
+1
-1
app/views/import/google_code/status.html.haml
app/views/import/google_code/status.html.haml
+4
-4
changelogs/unreleased/202230-migrate-spinner-for-app-views-imports.yml
...released/202230-migrate-spinner-for-app-views-imports.yml
+5
-0
No files found.
app/views/import/_project_status.html.haml
View file @
e1038ea3
...
...
@@ -3,7 +3,7 @@
=
icon
(
'check'
)
=
_
(
'Done'
)
-
when
'started'
=
icon
(
"spinner spin"
)
=
loading_icon
=
_
(
'Started'
)
-
when
'failed'
=
_
(
'Failed'
)
...
...
app/views/import/google_code/status.html.haml
View file @
e1038ea3
...
...
@@ -15,11 +15,11 @@
-
if
@incompatible_repos
.
any?
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
_
(
"Import all compatible projects"
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
=
loading_icon
(
css_class:
'loading-icon'
)
-
else
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
_
(
"Import all projects"
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
=
loading_icon
(
css_class:
'loading-icon'
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -45,7 +45,7 @@
%i
.fa.fa-check
=
_
(
"done"
)
-
when
'started'
%i
.fa.fa-spinner.fa-spi
n
=
loading_ico
n
=
_
(
"started"
)
-
else
=
project
.
human_import_status_name
...
...
@@ -59,7 +59,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
=
_
(
"Import"
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
=
loading_icon
(
css_class:
'loading-icon'
)
-
@incompatible_repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%td
...
...
changelogs/unreleased/202230-migrate-spinner-for-app-views-imports.yml
0 → 100644
View file @
e1038ea3
---
title
:
Migrate '.fa-spinner' to '.spinner' for 'app/views/imports'
merge_request
:
41153
author
:
Gilang Gumilar
type
:
changed
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