Commit e7f80806666aef65dae9293dbda34f994299f7b2

Authored by Dmitriy Zaporozhets
2 parents c06255e1 db880cf3

Merge branch 'wording-of-link-text' into 'master'

Wording of link text
app/views/profiles/show.html.haml
@@ -33,8 +33,9 @@ @@ -33,8 +33,9 @@
33 = f.text_field :email, class: "form-control", required: true 33 = f.text_field :email, class: "form-control", required: true
34 - if @user.unconfirmed_email.present? 34 - if @user.unconfirmed_email.present?
35 %span.help-block 35 %span.help-block
36 - We sent confirmation email to 36 + Please click the link in the confirmation email before continuing, it was send to
37 %strong #{@user.unconfirmed_email} 37 %strong #{@user.unconfirmed_email}
  38 +
38 - else 39 - else
39 %span.help-block We also use email for avatar detection if no avatar is uploaded. 40 %span.help-block We also use email for avatar detection if no avatar is uploaded.
40 .form-group 41 .form-group
doc/integration/github_app.png 0 → 100644

73.8 KB