summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-26 09:11:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-26 09:11:22 +0300
commitfabe282873382cfc40dbab6b23f138cc6c44f250 (patch)
tree93e5529b6cefbb7d059835700973e93a52e966d1
parent46ad5462871ee8cdaf31189d4ccae03cc0fe1119 (diff)
parente71e8609cf7b92b9d2fc9e92f2c58490a6432afd (diff)
downloadgitlab-ce-fabe282873382cfc40dbab6b23f138cc6c44f250.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--app/views/profiles/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index e03a43cbf1f..ed19dccf53e 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -36,7 +36,7 @@
= f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present?
%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}
- else