diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-26 10:57:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-26 10:57:21 +0300 |
| commit | d2bba30f42cc21059b504439b3e626e70e035176 (patch) | |
| tree | bc9bb70f588110529c99d2fa327d19ea89fc8332 /app/controllers | |
| parent | 701adc21d6d5e523684ffc8078a4abb6e068e5a3 (diff) | |
| parent | 0d22b2141f4ba9f75039d9614027b99946f35622 (diff) | |
Merge branch 'update_project_flash_error_message' into 'master'
Set flash error message only for current request when updating project
Closes #43772
See merge request gitlab-org/gitlab-ce!20126
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index efb30ba4715..c2492a137fb 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -63,7 +63,7 @@ class ProjectsController < Projects::ApplicationController redirect_to(edit_project_path(@project)) end else - flash[:alert] = result[:message] + flash.now[:alert] = result[:message] format.html { render 'edit' } end |