Merge branch 'master' into feature/#17

Conflicts:
	app/views/exceptionhandler/index.html.erb
This commit is contained in:
ricky committed 2012-04-29 00:52:41 -04:00
commit 9ebea9bc1f
2 files changed
+5 -5

No files matched your search

@@ -63,7 +63,8 @@ class ExceptionhandlerController < ApplicationController
issue.save
flash.now[:notice] = "New report filed: ##{issue.id}"
else
flash.now[:error] = issue.errors.full_messages
flash.now[:error] = "There was an error with filing this report"
@output = issue.errors.full_messages
end
#TODO generate link to issue