summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authortkimia <tkimia@purdue.edu>2014-04-24 19:22:14 -0400
committertkimia <tkimia@purdue.edu>2014-04-24 19:22:14 -0400
commit9788bda30fd076215c720c49ebf8b6ae2303930d (patch)
treee6573686b929ff95dde8a0e31947aeabd1704c62 /app/controllers
parent7de35332168374c176915cfeced61acc11f0ec8e (diff)
parent379cf06b33c672e01845c9c826ce58f8517059bd (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/pms_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
index 9dbe760..c83d2ae 100644
--- a/app/controllers/pms_controller.rb
+++ b/app/controllers/pms_controller.rb
@@ -77,6 +77,6 @@ class PmsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def pm_params
- params.require(:pm).permit(:author_id, :recipient_id, :message)
+ params.require(:pm).permit(:author_id, :recipient_id, :message, :subject, :conversation_id)
end
end