diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
| commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
| tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /app/controllers/admin_user_controller.rb | |
| parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
| parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) | |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'app/controllers/admin_user_controller.rb')
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index 929b93e0e..940a5fe8f 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -48,6 +48,7 @@ class AdminUserController < AdminController @admin_user.ban_text = params[:admin_user][:ban_text] @admin_user.about_me = params[:admin_user][:about_me] @admin_user.no_limit = params[:admin_user][:no_limit] + @admin_user.can_make_batch_requests = params[:admin_user][:can_make_batch_requests] if @admin_user.valid? @admin_user.save! |