diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-10 13:36:50 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:52 +0100 |
| commit | 9541bad2647360c35916b6a402122501b5374c29 (patch) | |
| tree | addf94e4d7c3db186e67c00825ee83d0e8c7599f | |
| parent | 4224124ddf5c47409af488c21caf10525edcde16 (diff) | |
| download | gitlab-ce-9541bad2647360c35916b6a402122501b5374c29.tar.gz | |
Check `service.discussion_to_resolve_id` to decide content of flash
That way the check is the same in the service & the controller
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 91fe6662164..f2fee62ebd6 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -110,7 +110,7 @@ class Projects::IssuesController < Projects::ApplicationController @issue = service.execute if service.discussions_to_resolve.count(&:resolved?) > 0 - flash[:notice] = if params[:discussion_to_resolve].present? + flash[:notice] = if service.discussion_to_resolve_id "Resolved 1 discussion." else "Resolved all discussions." |