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
Léo-Paul Géneau
gitlab-ce
Commits
39fbac86
Commit
39fbac86
authored
Sep 24, 2017
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix whitespace
parent
d97b577a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/views/devise/mailer/confirmation_instructions.html.haml
app/views/devise/mailer/confirmation_instructions.html.haml
+1
-1
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-2
No files found.
app/views/devise/mailer/confirmation_instructions.html.haml
View file @
39fbac86
=
render
partial:
"confirmation_instructions_
#{
@resource
.
is_a?
(
User
)
?
'account'
:
'secondary'
}
"
=
render
partial:
"confirmation_instructions_
#{
@resource
.
is_a?
(
User
)
?
'account'
:
'secondary'
}
"
\ No newline at end of file
app/views/profiles/emails/index.html.haml
View file @
39fbac86
...
@@ -50,8 +50,7 @@
...
@@ -50,8 +50,7 @@
-
unless
email
.
confirmed?
-
unless
email
.
confirmed?
-
confirm_title
=
"
#{
email
.
confirmation_sent_at
?
'Resend'
:
'Send'
}
confirmation email"
-
confirm_title
=
"
#{
email
.
confirmation_sent_at
?
'Resend'
:
'Send'
}
confirmation email"
=
link_to
confirm_title
,
resend_confirmation_instructions_profile_email_path
(
email
),
method: :put
,
class:
'btn btn-sm btn-warning prepend-left-10'
=
link_to
confirm_title
,
resend_confirmation_instructions_profile_email_path
(
email
),
method: :put
,
class:
'btn btn-sm btn-warning prepend-left-10'
=
link_to
profile_email_path
(
email
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-sm btn-danger prepend-left-10'
do
=
link_to
profile_email_path
(
email
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-sm btn-danger prepend-left-10'
do
%span
.sr-only
Remove
%span
.sr-only
Remove
=
icon
(
'trash'
)
=
icon
(
'trash'
)
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