Commit fabe2828 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 46ad5462 e71e8609
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
= f.text_field :email, class: "form-control", required: true = f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present? - if @user.unconfirmed_email.present?
%span.help-block %span.help-block
Please click the link in the confirmation email before continuing, it was send to Please click the link in the confirmation email before continuing, it was sent to
%strong #{@user.unconfirmed_email} %strong #{@user.unconfirmed_email}
- else - else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment