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
793d9799
Commit
793d9799
authored
Jun 03, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show key fingerprint on DeployKeys#index
Also style all key fingerprints consistently across the app.
parent
6e5473f9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
15 deletions
+16
-15
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+7
-0
app/views/admin/deploy_keys/index.html.haml
app/views/admin/deploy_keys/index.html.haml
+1
-2
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+1
-2
app/views/profiles/keys/_key_details.html.haml
app/views/profiles/keys/_key_details.html.haml
+1
-1
app/views/projects/deploy_keys/_deploy_key.html.haml
app/views/projects/deploy_keys/_deploy_key.html.haml
+6
-10
No files found.
app/assets/stylesheets/generic/typography.scss
View file @
793d9799
...
...
@@ -23,6 +23,13 @@ pre {
font-family
:
$monospace_font
;
}
code
{
&
.key-fingerprint
{
background
:
$body-bg
;
color
:
$text-color
;
}
}
/**
* Wiki typography
*
...
...
app/views/admin/deploy_keys/index.html.haml
View file @
793d9799
...
...
@@ -19,8 +19,7 @@
=
link_to
admin_deploy_key_path
(
deploy_key
)
do
%strong
=
deploy_key
.
title
%td
%span
(
#{
deploy_key
.
fingerprint
}
)
%code
.key-fingerprint
=
deploy_key
.
fingerprint
%td
%span
.cgray
added
#{
time_ago_with_tooltip
(
deploy_key
.
created_at
)
}
...
...
app/views/profiles/keys/_key.html.haml
View file @
793d9799
...
...
@@ -3,8 +3,7 @@
=
link_to
path_to_key
(
key
,
is_admin
)
do
%strong
=
key
.
title
%td
%span
(
#{
key
.
fingerprint
}
)
%code
.key-fingerprint
=
key
.
fingerprint
%td
%span
.cgray
added
#{
time_ago_with_tooltip
(
key
.
created_at
)
}
...
...
app/views/profiles/keys/_key_details.html.haml
View file @
793d9799
...
...
@@ -15,7 +15,7 @@
.col-md-8
%p
%span
.light
Fingerprint:
%
strong
=
@key
.
fingerprint
%
code
.key-fingerprint
=
@key
.
fingerprint
%pre
.well-pre
=
@key
.
key
.pull-right
...
...
app/views/projects/deploy_keys/_deploy_key.html.haml
View file @
793d9799
...
...
@@ -2,24 +2,20 @@
.pull-right
-
if
@available_keys
.
include?
(
deploy_key
)
=
link_to
enable_namespace_project_deploy_key_path
(
@project
.
namespace
,
@project
,
deploy_key
),
class:
'btn btn-sm'
,
method: :put
do
%i
.fa.fa-plus
=
icon
(
'plus'
)
Enable
-
else
-
if
deploy_key
.
destroyed_when_orphaned?
&&
deploy_key
.
almost_orphaned?
=
link_to
'Remove'
,
disable_namespace_project_deploy_key_path
(
@project
.
namespace
,
@project
,
deploy_key
),
data:
{
confirm:
'You are going to remove deploy key. Are you sure?'
},
method: :put
,
class:
"btn btn-remove delete-key btn-sm pull-right"
-
else
=
link_to
disable_namespace_project_deploy_key_path
(
@project
.
namespace
,
@project
,
deploy_key
),
class:
'btn btn-sm'
,
method: :put
do
%i
.fa.fa-power-off
=
icon
(
'power-off'
)
Disable
-
if
project
=
project_for_deploy_key
(
deploy_key
)
=
link_to
namespace_project_deploy_key_path
(
project
.
namespace
,
project
,
deploy_key
)
do
%i
.fa.fa-key
%strong
=
deploy_key
.
title
-
else
%i
.fa.fa-key
%strong
=
deploy_key
.
title
=
icon
(
'key'
)
%strong
=
deploy_key
.
title
%br
%code
.key-fingerprint
=
deploy_key
.
fingerprint
%p
.light.prepend-top-10
-
if
deploy_key
.
public?
...
...
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