diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 14:36:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 14:36:07 +0000 |
| commit | 0c291f35f5324d159155d16aa632fad412a2d3a3 (patch) | |
| tree | 69623e31d0aac436dbc2f12d588f1950a45c1fff | |
| parent | 9535ce2caa7122e3f1be8932660c3d53e0457bbc (diff) | |
| parent | f815115de69c0bd746031e3389acfcdf2a306a75 (diff) | |
| download | gitlab-ce-0c291f35f5324d159155d16aa632fad412a2d3a3.tar.gz | |
Merge branch 'raise-on-forgery' into 'master'
Raise on forgery
Fixes #1572
See merge request !1156
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1a5215ca309..13d8d2a3e0a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base before_filter :configure_permitted_parameters, if: :devise_controller? before_filter :require_email, unless: :devise_controller? - protect_from_forgery + protect_from_forgery with: :exception helper_method :abilities, :can? |