From 34ac576bf7efbddac0a89731292eac8974f95114 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 18 Dec 2013 00:10:01 -0800 Subject: enable billing engine by default, consolidate APP_CONFIG[:payments] and APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree] --- config/defaults.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config/defaults.yml') diff --git a/config/defaults.yml b/config/defaults.yml index 260915e..a1b6235 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -44,6 +44,7 @@ common: &common # see /users/app/views/users/_edit.html.haml for a list. user_actions: ['destroy_account'] admin_actions: ['change_pgp_key', 'change_service_level', 'destroy_account'] + billing: ~ service_levels: &service_levels service_levels: @@ -75,7 +76,6 @@ development: admins: [blue, admin, admin2] domain: example.org secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - payment: [] reraise_errors: true test: @@ -87,8 +87,8 @@ test: admins: [admin, admin2] domain: test.me secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - payment: [billing] reraise_errors: true + billing: true production: <<: *downloads @@ -96,5 +96,4 @@ production: <<: *common admins: [] domain: example.net - payment: [] # logfile: /path/to/your/logs -- cgit v1.2.3