diff options
| author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
| commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
| tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /config/defaults.yml | |
| parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'config/defaults.yml')
| -rw-r--r-- | config/defaults.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index f3b92c0..54c5a23 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -16,9 +16,10 @@ cert_options: &cert_options development: <<: *dev_ca <<: *cert_options - admins: [admin, admin2] - domain: develop.me + admins: [blue, admin, admin2] + domain: example.org secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' + pagination_size: 30 test: <<: *dev_ca @@ -26,8 +27,10 @@ test: admins: [admin, admin2] domain: test.me secret_token: '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100' + pagination_size: 30 production: <<: *cert_options admins: [] - domain: deploy.me + domain: example.net + pagination_size: 30
\ No newline at end of file |