Allow setting HTTP ACCEPT header for notes API

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index d136e7230a4b7baf3ccd6eebfda383843598fdc2..5940389397ca76e8b7b6d9a524a76d9df41185c0 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -47,9 +47,10 @@ class IssuesController < ApplicationController
     @new_comment = IssueComment.new(:issue => @issue)
   end
 
-  # Status Transistions
+  # Status Transitions
   def resolve
     if @issue.resolve
+      @issue.updated_by = current_user.id
       @issue.save!
       redirect_to @issue, :notice => t(".resolved")
     else
@@ -82,6 +83,6 @@ class IssuesController < ApplicationController
   def find_issue
     @issue = Issue.visible_to(current_user).find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    head :not_found
+    redirect_to :controller => "errors", :action => "not_found"
   end
 end