summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-27 07:09:13 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-27 07:09:13 -0700
commit6981c207a0c9c42f6d40bdb0946dc83c75500075 (patch)
treef4639af7b0f2cad92e7e9bbdf0c49be5e8761d74
parent0fa3f37dea09d99864a814420056ab4fe5bb61bb (diff)
parent3fb6ad9020ccde4d5e3b9bf3c36f5b201a8f6e7a (diff)
downloadgitlab-ce-6981c207a0c9c42f6d40bdb0946dc83c75500075.tar.gz
Merge pull request #5453 from perryfaro/password-page
Reset buttons/links on the reset password page
-rw-r--r--app/views/devise/passwords/edit.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index d85b4ab08b2..3e4a4a0f1c8 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -7,5 +7,8 @@
%div
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
%div
+ .clearfix.append-bottom-10
= f.submit "Change my password", class: "btn btn-primary"
- .pull-right= render partial: "devise/shared/links"
+ = link_to "Sign in", new_session_path(resource_name), class: "btn pull-right"
+ %div
+ = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)