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
Jérome Perrin
gitlab-ce
Commits
d36a7803
Commit
d36a7803
authored
Apr 05, 2017
by
Andrew Torres
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update all instances of "fa-refresh" to "fa-spinner"
parent
04a3e60e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
8 deletions
+12
-8
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+1
-1
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+3
-3
app/views/admin/health_check/show.html.haml
app/views/admin/health_check/show.html.haml
+1
-1
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+1
-1
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
changelogs/unreleased/22714-update-all-instances-of-fa-refresh.yml
...s/unreleased/22714-update-all-instances-of-fa-refresh.yml
+4
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js
View file @
d36a7803
...
@@ -50,7 +50,7 @@ window.gl.GfmAutoComplete = {
...
@@ -50,7 +50,7 @@ window.gl.GfmAutoComplete = {
template
:
'
<li>${title}</li>
'
template
:
'
<li>${title}</li>
'
},
},
Loading
:
{
Loading
:
{
template
:
'
<li style="pointer-events: none;"><i class="fa fa-
refresh
fa-spin"></i> Loading...</li>
'
template
:
'
<li style="pointer-events: none;"><i class="fa fa-
spinner
fa-spin"></i> Loading...</li>
'
},
},
DefaultOptions
:
{
DefaultOptions
:
{
sorter
:
function
(
query
,
items
,
searchKey
)
{
sorter
:
function
(
query
,
items
,
searchKey
)
{
...
...
app/assets/stylesheets/pages/builds.scss
View file @
d36a7803
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
overflow-y
:
hidden
;
overflow-y
:
hidden
;
font-size
:
12px
;
font-size
:
12px
;
.fa-
refresh
{
.fa-
spinner
{
font-size
:
24px
;
font-size
:
24px
;
margin-left
:
20px
;
margin-left
:
20px
;
}
}
...
@@ -219,7 +219,7 @@
...
@@ -219,7 +219,7 @@
font-size
:
12px
;
font-size
:
12px
;
position
:
relative
;
position
:
relative
;
.fa-
refresh
{
.fa-
spinner
{
font-size
:
24px
;
font-size
:
24px
;
}
}
...
@@ -366,7 +366,7 @@
...
@@ -366,7 +366,7 @@
background-color
:
$row-hover
;
background-color
:
$row-hover
;
}
}
.fa-
refresh
{
.fa-
spinner
{
font-size
:
13px
;
font-size
:
13px
;
margin-left
:
3px
;
margin-left
:
3px
;
}
}
...
...
app/views/admin/health_check/show.html.haml
View file @
d36a7803
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
button_to
reset_health_check_token_admin_application_settings_path
,
=
button_to
reset_health_check_token_admin_application_settings_path
,
method: :put
,
class:
'btn btn-default'
,
method: :put
,
class:
'btn btn-default'
,
data:
{
confirm:
'Are you sure you want to reset the health check token?'
}
do
data:
{
confirm:
'Are you sure you want to reset the health check token?'
}
do
=
icon
(
'
refresh
'
)
=
icon
(
'
spinner
'
)
Reset health check access token
Reset health check access token
%p
.light
%p
.light
Health information can be retrieved as plain text, JSON, or XML using:
Health information can be retrieved as plain text, JSON, or XML using:
...
...
app/views/admin/runners/index.html.haml
View file @
d36a7803
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
=
button_to
reset_runners_token_admin_application_settings_path
,
=
button_to
reset_runners_token_admin_application_settings_path
,
method: :put
,
class:
'btn btn-default'
,
method: :put
,
class:
'btn btn-default'
,
data:
{
confirm:
'Are you sure you want to reset registration token?'
}
do
data:
{
confirm:
'Are you sure you want to reset registration token?'
}
do
=
icon
(
'
refresh
'
)
=
icon
(
'
spinner
'
)
Reset runners registration token
Reset runners registration token
.bs-callout
.bs-callout
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
d36a7803
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
-
else
-
else
=
build
.
id
=
build
.
id
-
if
build
.
retried?
-
if
build
.
retried?
%i
.fa.fa-
refresh
.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
%i
.fa.fa-
spinner
.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
:javascript
:javascript
new
Sidebar
();
new
Sidebar
();
app/views/projects/ci/builds/_build.html.haml
View file @
d36a7803
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Job is stuck. Check runners.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Job is stuck. Check runners.'
)
-
if
retried
-
if
retried
=
icon
(
'
refresh
'
,
class:
'text-warning has-tooltip'
,
title:
'Job was retried'
)
=
icon
(
'
spinner
'
,
class:
'text-warning has-tooltip'
,
title:
'Job was retried'
)
.label-container
.label-container
-
if
job
.
tags
.
any?
-
if
job
.
tags
.
any?
...
...
changelogs/unreleased/22714-update-all-instances-of-fa-refresh.yml
0 → 100644
View file @
d36a7803
---
title
:
Update all instances of the old loading icon
merge_request
:
10490
author
:
Andrew Torres
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