diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-20 16:14:19 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-20 16:14:19 +0200 |
| commit | 3f73d611cb7f80aafffd5b4526eb0faeebf624f6 (patch) | |
| tree | f87ac47a9d14849659a8a40a53576080593b0670 /app/controllers/application_controller.rb | |
| parent | 76aade28e25d1f6e8924b35ed9bd365c8889987f (diff) | |
| parent | 5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3 (diff) | |
| download | gitlab-ce-3f73d611cb7f80aafffd5b4526eb0faeebf624f6.tar.gz | |
Merge pull request #9145 from jvanbaarsen/before-action-rubocop
Fixed the Rails/ActionFilter cop
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 920a981e7c9..8ddb424dcfb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,15 +6,15 @@ class ApplicationController < ActionController::Base PER_PAGE = 20 - before_filter :authenticate_user_from_token! - before_filter :authenticate_user! - before_filter :reject_blocked! - before_filter :check_password_expiration - before_filter :ldap_security_check - before_filter :default_headers - before_filter :add_gon_variables - before_filter :configure_permitted_parameters, if: :devise_controller? - before_filter :require_email, unless: :devise_controller? + before_action :authenticate_user_from_token! + before_action :authenticate_user! + before_action :reject_blocked! + before_action :check_password_expiration + before_action :ldap_security_check + before_action :default_headers + before_action :add_gon_variables + before_action :configure_permitted_parameters, if: :devise_controller? + before_action :require_email, unless: :devise_controller? protect_from_forgery with: :exception |