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
98865ef1
Commit
98865ef1
authored
Aug 03, 2020
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replaced Edit + Lock Icons with SVG Icons
parent
7b23102e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
app/helpers/snippets_helper.rb
app/helpers/snippets_helper.rb
+3
-3
app/views/projects/runners/_runner.html.haml
app/views/projects/runners/_runner.html.haml
+4
-3
ee/app/views/projects/path_locks/_path_lock.html.haml
ee/app/views/projects/path_locks/_path_lock.html.haml
+1
-1
No files found.
app/helpers/snippets_helper.rb
View file @
98865ef1
...
@@ -60,9 +60,9 @@ module SnippetsHelper
...
@@ -60,9 +60,9 @@ module SnippetsHelper
def
snippet_badge
(
snippet
)
def
snippet_badge
(
snippet
)
return
unless
attrs
=
snippet_badge_attributes
(
snippet
)
return
unless
attrs
=
snippet_badge_attributes
(
snippet
)
css_class
,
text
=
attrs
icon_name
,
text
=
attrs
tag
.
span
(
class:
%w[badge badge-gray]
)
do
tag
.
span
(
class:
%w[badge badge-gray]
)
do
concat
(
tag
.
i
(
class:
[
'fa'
,
css_class
]
))
concat
(
sprite_icon
(
icon_name
,
size:
14
,
css_class:
'vertical-align-middle'
))
concat
(
' '
)
concat
(
' '
)
concat
(
text
)
concat
(
text
)
end
end
...
@@ -70,7 +70,7 @@ module SnippetsHelper
...
@@ -70,7 +70,7 @@ module SnippetsHelper
def
snippet_badge_attributes
(
snippet
)
def
snippet_badge_attributes
(
snippet
)
if
snippet
.
private?
if
snippet
.
private?
[
'
fa-
lock'
,
_
(
'private'
)]
[
'lock'
,
_
(
'private'
)]
end
end
end
end
...
...
app/views/projects/runners/_runner.html.haml
View file @
98865ef1
...
@@ -6,11 +6,12 @@
...
@@ -6,11 +6,12 @@
=
link_to
_
(
"%{token}..."
)
%
{
token:
runner
.
short_sha
},
project_runner_path
(
@project
,
runner
),
class:
'commit-sha has-tooltip'
,
title:
_
(
"Partial token for reference only"
)
=
link_to
_
(
"%{token}..."
)
%
{
token:
runner
.
short_sha
},
project_runner_path
(
@project
,
runner
),
class:
'commit-sha has-tooltip'
,
title:
_
(
"Partial token for reference only"
)
-
if
runner
.
locked?
-
if
runner
.
locked?
=
icon
(
'lock'
,
class:
'has-tooltip'
,
title:
_
(
'Locked to current projects'
))
%span
.has-tooltip
{
title:
_
(
'Locked to current projects'
)
}
=
sprite_icon
(
'lock'
,
size:
16
)
%small
.edit-runner
%small
.edit-runner
=
link_to
edit_project_runner_path
(
@project
,
runner
)
do
=
link_to
edit_project_runner_path
(
@project
,
runner
)
,
class:
'btn btn-edit'
do
%i
.fa.fa-edit.btn
=
sprite_icon
(
'pencil'
,
size:
16
)
-
else
-
else
%span
.commit-sha
%span
.commit-sha
=
runner
.
short_sha
=
runner
.
short_sha
...
...
ee/app/views/projects/path_locks/_path_lock.html.haml
View file @
98865ef1
%li
{
data:
{
qa_selector:
'locked_file_content'
}
}
%li
{
data:
{
qa_selector:
'locked_file_content'
}
}
%div
%div
%span
.item-title
{
data:
{
qa_selector:
'locked_file_title_content'
}
}
%span
.item-title
{
data:
{
qa_selector:
'locked_file_title_content'
}
}
=
icon
(
'lock
'
)
=
sprite_icon
(
'lock'
,
size:
14
,
css_class:
'gl-mr-1 vertical-align-middle
'
)
=
path_lock
.
path
=
path_lock
.
path
.controls
.controls
...
...
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