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
37be9fdf
Commit
37be9fdf
authored
Aug 24, 2020
by
Jiaan Louw
Committed by
Martin Wortschack
Aug 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-remove with SVG close icons
parent
d91c949f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
app/views/groups/runners/_runner.html.haml
app/views/groups/runners/_runner.html.haml
+2
-2
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
No files found.
app/views/admin/runners/_runner.html.haml
View file @
37be9fdf
...
...
@@ -76,4 +76,4 @@
=
sprite_icon
(
'play'
)
.btn-group
=
link_to
[
:admin
,
runner
],
method: :delete
,
class:
'btn btn-danger has-tooltip'
,
title:
_
(
'Remove'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Remove'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
icon
(
'remov
e'
)
=
sprite_icon
(
'clos
e'
)
app/views/groups/runners/_runner.html.haml
View file @
37be9fdf
...
...
@@ -79,8 +79,8 @@
-
if
runner
.
belongs_to_more_than_one_project?
.btn-group
.btn.btn-danger.has-tooltip
{
'aria-label'
=>
'Remove'
,
'data-container'
=>
'body'
,
'data-original-title'
=>
_
(
'Multi-project Runners cannot be removed'
),
'data-placement'
=>
'top'
,
disabled:
'disabled'
}
=
icon
(
'remov
e'
)
=
sprite_icon
(
'clos
e'
)
-
else
.btn-group
=
link_to
group_runner_path
(
@group
,
runner
),
method: :delete
,
class:
'btn btn-danger has-tooltip'
,
title:
_
(
'Remove'
),
ref:
'tooltip'
,
aria:
{
label:
_
(
'Remove'
)
},
data:
{
placement:
'top'
,
container:
'body'
,
confirm:
_
(
'Are you sure?'
)
}
do
=
icon
(
'remov
e'
)
=
sprite_icon
(
'clos
e'
)
app/views/projects/ci/builds/_build.html.haml
View file @
37be9fdf
...
...
@@ -102,7 +102,7 @@
-
if
can?
(
current_user
,
:update_build
,
job
)
-
if
job
.
active?
=
link_to
cancel_project_job_path
(
job
.
project
,
job
,
continue:
{
to:
request
.
fullpath
}),
method: :post
,
title:
_
(
'Cancel'
),
class:
'btn btn-build'
do
=
icon
(
'remove'
,
class:
'cred
'
)
=
sprite_icon
(
'close
'
)
-
elsif
job
.
scheduled?
.btn-group
.btn.btn-default
{
disabled:
true
}
...
...
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