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
c56208f9
Commit
c56208f9
authored
Sep 09, 2017
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored `_email_with_badge` partial from gpg into shared, so it can
be used with the email profile page as well
parent
f5937926
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+2
-2
app/views/profiles/gpg_keys/_key.html.haml
app/views/profiles/gpg_keys/_key.html.haml
+1
-1
app/views/shared/_email_with_badge.html.haml
app/views/shared/_email_with_badge.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
c56208f9
...
@@ -392,11 +392,11 @@ table.u2f-registrations {
...
@@ -392,11 +392,11 @@ table.u2f-registrations {
}
}
}
}
.
gpg-
email-badge
{
.email-badge
{
display
:
inline
;
display
:
inline
;
margin-right
:
$gl-padding
/
2
;
margin-right
:
$gl-padding
/
2
;
.
gpg-
email-badge-email
{
.email-badge-email
{
display
:
inline
;
display
:
inline
;
margin-right
:
$gl-padding
/
4
;
margin-right
:
$gl-padding
/
4
;
}
}
...
...
app/views/profiles/gpg_keys/_key.html.haml
View file @
c56208f9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
icon
'key'
,
class:
"settings-list-icon hidden-xs"
=
icon
'key'
,
class:
"settings-list-icon hidden-xs"
.key-list-item-info
.key-list-item-info
-
key
.
emails_with_verified_status
.
map
do
|
email
,
verified
|
-
key
.
emails_with_verified_status
.
map
do
|
email
,
verified
|
=
render
partial:
'email_with_badge'
,
locals:
{
email:
email
,
verified:
verified
}
=
render
partial:
'
shared/
email_with_badge'
,
locals:
{
email:
email
,
verified:
verified
}
.description
.description
%code
=
key
.
fingerprint
%code
=
key
.
fingerprint
...
...
app/views/
profiles/gpg_keys
/_email_with_badge.html.haml
→
app/views/
shared
/_email_with_badge.html.haml
View file @
c56208f9
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
css_classes
<<
(
verified
?
'verified'
:
'unverified'
)
-
css_classes
<<
(
verified
?
'verified'
:
'unverified'
)
-
text
=
verified
?
'Verified'
:
'Unverified'
-
text
=
verified
?
'Verified'
:
'Unverified'
.
gpg-
email-badge
.email-badge
.
gpg-
email-badge-email
=
email
.email-badge-email
=
email
%div
{
class:
css_classes
}
%div
{
class:
css_classes
}
=
text
=
text
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