diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-18 16:08:20 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-18 16:08:20 +0000 |
| commit | d4d8096429cc9a97efbde63ef37cd1cc7d12708c (patch) | |
| tree | 6ab3b13fa0a37e02876d9ac808e5ba00ea8d967b /app/controllers/user_controller.rb | |
| parent | c0a3dc4571090fc553fd608cf1ac83e21f0290f4 (diff) | |
| parent | 6d587c328b7d58fb322bd9cf490b213c3ff1ffad (diff) | |
Merge branch 'brakeman_fixes' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 9798ff8e2..b7c8252f5 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -7,15 +7,8 @@ require 'set' class UserController < ApplicationController - layout :select_layout - protect_from_forgery :only => [ :contact, - :set_profile_photo, - :signchangeemail, - :clear_profile_photo, - :set_profile_about_me ] # See ActionController::RequestForgeryProtection for details - # Show page about a user def show long_cache |