diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 12:18:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 12:18:04 +0000 |
| commit | e7f80806666aef65dae9293dbda34f994299f7b2 (patch) | |
| tree | e3d592eee26a3729fab97c8eed522121a2567594 | |
| parent | c06255e1508417d68a0ebc43192f77136cd40af4 (diff) | |
| parent | db880cf39f9a68bb7d18b028fe6c1b843d5ca6cb (diff) | |
| download | gitlab-ce-e7f80806666aef65dae9293dbda34f994299f7b2.tar.gz | |
Merge branch 'wording-of-link-text' into 'master'
Wording of link text
| -rw-r--r-- | app/views/profiles/show.html.haml | 3 | ||||
| -rw-r--r-- | doc/integration/github_app.png | bin | 0 -> 75607 bytes |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 523a07db400..26e9f22c3cc 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -33,8 +33,9 @@ = f.text_field :email, class: "form-control", required: true - if @user.unconfirmed_email.present? %span.help-block - We sent confirmation email to + Please click the link in the confirmation email before continuing, it was send to %strong #{@user.unconfirmed_email} + - else %span.help-block We also use email for avatar detection if no avatar is uploaded. .form-group diff --git a/doc/integration/github_app.png b/doc/integration/github_app.png Binary files differnew file mode 100644 index 00000000000..c0873b2e20d --- /dev/null +++ b/doc/integration/github_app.png |
