Merge remote-tracking branch 'upstream/pull/3217'

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index cd3584f027536b00e067f04050d234893b68f921..f30ece3ec023d3dcef7523d8ad7584a8919d2c40 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -50,6 +50,7 @@ class IssuesController < ApplicationController
   # Status Transistions
   def resolve
     if @issue.resolve
+      @issue.updated_by = current_user.id
       @issue.save!
       redirect_to @issue, :notice => t(".resolved")
     else