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
78c8ecf2
Commit
78c8ecf2
authored
Jan 19, 2021
by
Yogi
Committed by
David O'Regan
Jan 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move email badges to new GitLab UI badges
parent
82325168
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+7
-7
changelogs/unreleased/yo-gl-badge-user-emails.yml
changelogs/unreleased/yo-gl-badge-user-emails.yml
+5
-0
No files found.
app/views/profiles/emails/index.html.haml
View file @
78c8ecf2
...
...
@@ -37,23 +37,23 @@
%li
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
@primary_email
,
verified:
current_user
.
confirmed?
}
%span
.float-right
%span
.badge.badge-success
=
s_
(
'Profiles|Primary email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
success
=
s_
(
'Profiles|Primary email'
)
-
if
@primary_email
===
current_user
.
commit_email
%span
.badge.badge-info
=
s_
(
'Profiles|Commit email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Commit email'
)
-
if
@primary_email
===
current_user
.
public_email
%span
.badge.badge-info
=
s_
(
'Profiles|Public email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Public email'
)
-
if
@primary_email
===
current_user
.
notification_email
%span
.badge.badge-info
=
s_
(
'Profiles|Default notification email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Default notification email'
)
-
@emails
.
each
do
|
email
|
%li
{
data:
{
qa_selector:
'email_row_content'
}
}
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
email
.
email
,
verified:
email
.
confirmed?
}
%span
.float-right
-
if
email
.
email
===
current_user
.
commit_email
%span
.badge.badge-info
=
s_
(
'Profiles|Commit email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Commit email'
)
-
if
email
.
email
===
current_user
.
public_email
%span
.badge.badge-info
=
s_
(
'Profiles|Public email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Public email'
)
-
if
email
.
email
===
current_user
.
notification_email
%span
.badge.badge-info
=
s_
(
'Profiles|Notification email'
)
%span
.badge.badge-
muted.badge-pill.gl-badge.badge-
info
=
s_
(
'Profiles|Notification email'
)
-
unless
email
.
confirmed?
-
confirm_title
=
"
#{
email
.
confirmation_sent_at
?
_
(
'Resend confirmation email'
)
:
_
(
'Send confirmation email'
)
}
"
=
link_to
confirm_title
,
resend_confirmation_instructions_profile_email_path
(
email
),
method: :put
,
class:
'gl-button btn btn-sm btn-warning gl-ml-3'
...
...
changelogs/unreleased/yo-gl-badge-user-emails.yml
0 → 100644
View file @
78c8ecf2
---
title
:
Move email badges to new GitLab UI badges
merge_request
:
51915
author
:
Yogi (@yo)
type
:
other
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