Merge branch 'master' of https://github.com/Futseh/redstoner.com
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
<% if !@user.confirmed? %>
|
||||
<% if @user.is?(current_user) %>
|
||||
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
|
||||
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn red" %>
|
||||
<% else %>
|
||||
<span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
|
||||
<% end %>
|
||||
@@ -107,4 +108,4 @@
|
||||
<% else %>
|
||||
<%= render_md(@user.about).html_safe %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user