summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
committerjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
commit09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch)
tree3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /config
parent9979b50848ce27730f880159512933e50d5ae0e4 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/authentication_generic_error
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'config')
-rw-r--r--config/application.rb7
-rw-r--r--config/defaults.yml9
-rw-r--r--config/initializers/i18n.rb2
-rw-r--r--config/locales/en.yml5
4 files changed, 15 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb
index 957bb0d..5e52c7b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -59,11 +59,18 @@ module LeapWeb
# parameters by using an attr_accessible or attr_protected declaration.
# config.active_record.whitelist_attributes = true
+ ##
+ ## ASSETS
+ ##
+
# Enable the asset pipeline
config.assets.enabled = true
config.assets.initialize_on_precompile = false
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ # Set to false in order to see asset requests in the log
+ config.quiet_assets = true
end
end
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
diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
new file mode 100644
index 0000000..574d169
--- /dev/null
+++ b/config/initializers/i18n.rb
@@ -0,0 +1,2 @@
+
+I18n.available_locales = ['en']
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc61c31..63f1c3e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
en:
- hello: "Hello world"
- no_such_thing: "No such %{thing}."