diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 07:15:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 07:15:46 +0000 |
| commit | bf9372eaeb00d1ca5398d7d13f5afa65153e82da (patch) | |
| tree | 7d6cbd38549bcbe9412835d1b071ad8a90e57439 | |
| parent | 177b953d51f2d6f07d93a0d15b984746f88b18ad (diff) | |
| parent | e0022912d77a40938c576d4b67a61d8322473210 (diff) | |
| download | gitlab-ce-bf9372eaeb00d1ca5398d7d13f5afa65153e82da.tar.gz | |
Merge branch 'password-reset-wording' into 'master'
Password Reset Wording
| -rw-r--r-- | app/views/profiles/passwords/new.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index c8c0368d000..b72232ee36b 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -2,9 +2,9 @@ %hr = form_for @user, url: profile_password_path, method: :post, html: { class: 'form-horizontal '} do |f| %p.slead - Please set new password before proceed. + Please set a new password before proceeding. %br - After successful password update you will be redirected to login screen + After a successful password update you will be redirected to login screen. -if @user.errors.any? .alert.alert-danger %ul |