summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 13:35:10 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 13:35:10 +0200
commitf088c867a4b03104c349b9037198a895d1968f34 (patch)
tree217acf87ed83db847da08083c4343b9970e340d4 /app/controllers/application_controller.rb
parent2ab76ca5316d815e5cdb03782ff919397d343b26 (diff)
downloadgitlab-ce-f088c867a4b03104c349b9037198a895d1968f34.tar.gz
Fix signup for rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9ee50cfa3a4..c398593c5f6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
before_filter :dev_tools if Rails.env == 'development'
before_filter :default_headers
before_filter :add_gon_variables
+ before_filter :configure_permitted_parameters, if: :devise_controller?
protect_from_forgery
@@ -201,4 +202,9 @@ class ApplicationController < ActionController::Base
formats: [:html]
)
end
+
+ def configure_permitted_parameters
+ devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email, :password) }
+ devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:username, :email, :name, :password, :password_confirmation) }
+ end
end