Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Andres Keskküla 2014-09-22 11:02:24 +03:00
commit 9cc6fed5f2
15 changed files with 217 additions and 56 deletions

View file

@ -13,7 +13,7 @@ require 'sprockets/railtie'
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
module Internetee
module Registry
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers

View file

@ -3,13 +3,17 @@ default: &default
adapter: postgresql
encoding: unicode
pool: 5
username: internetee
password: internetee_pwd
username: registry
password: registry_pwd
development:
<<: *default
database: internetee_development
database: registry_development
test:
<<: *default
database: internetee_test
database: registry_test
production:
<<: *default
database: registry_production

View file

@ -1 +1 @@
Internetee::Application.config.autoload_paths += %W(#{Internetee::Application.config.root}/app/validators/)
Registry::Application.config.autoload_paths += %W(#{Registry::Application.config.root}/app/validators/)

View file

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, key: '_internetee_session'
Rails.application.config.session_store :cookie_store, key: '_registry_session'

View file

@ -5,4 +5,4 @@ test:
secret_key_base: generate-your-secret-key-by-rake-secret
production:
secret_key_base:
secret_key_base: please-change