diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-04-15 15:52:12 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-04-15 15:52:12 +0000 |
| commit | 57cdf56aa7df41b013d9c47c6b12bf5a9e20e4f4 (patch) | |
| tree | aa4e6e8aa09f2bc845cd36a7abcd7cb00b694c64 /app/controllers/profiles | |
| parent | fcb70d9bbbc14dc695fa87dc1dea5fa7fe78f6d2 (diff) | |
| parent | 650f40865e5d8136cb366fbde689c4100aafb0c5 (diff) | |
| download | gitlab-ce-57cdf56aa7df41b013d9c47c6b12bf5a9e20e4f4.tar.gz | |
Merge branch 'forbid-the-usage-of-reload' into 'master'
Forbid the usage of reload
Closes #60218
See merge request gitlab-org/gitlab-ce!27125
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/passwords_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb index a0391d677c4..7038447581c 100644 --- a/app/controllers/profiles/passwords_controller.rb +++ b/app/controllers/profiles/passwords_controller.rb @@ -55,7 +55,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController flash[:notice] = "Password was successfully updated. Please login with it" redirect_to new_user_session_path else - @user.reload + @user.reset render 'edit' end end |