diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-09 17:01:04 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-09 17:01:04 +0300 |
| commit | e50c0d5cb7bcdc1131dae8cd5d5de2947732cda8 (patch) | |
| tree | 94fd233b793f7163bf395ec012d0f0745e8538d6 /app/controllers/profiles/passwords_controller.rb | |
| parent | ffec158de4c6a78dfa17ae0063d8f796c21a58c8 (diff) | |
| download | gitlab-ce-e50c0d5cb7bcdc1131dae8cd5d5de2947732cda8.tar.gz | |
Fix spinach profile tests
Diffstat (limited to 'app/controllers/profiles/passwords_controller.rb')
| -rw-r--r-- | app/controllers/profiles/passwords_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb index b8d8395a7c4..df6954554ea 100644 --- a/app/controllers/profiles/passwords_controller.rb +++ b/app/controllers/profiles/passwords_controller.rb @@ -1,7 +1,7 @@ class Profiles::PasswordsController < ApplicationController layout :determine_layout - skip_before_filter :check_password_expiration + skip_before_filter :check_password_expiration, only: [:new, :create] before_filter :set_user before_filter :set_title @@ -44,7 +44,7 @@ class Profiles::PasswordsController < ApplicationController flash[:notice] = "Password was successfully updated. Please login with it" redirect_to new_user_session_path else - render 'account' + render 'edit' end end |