Merge branch 'develop' of github.com:sgmap/tps into develop

This commit is contained in:
Tanguy PATTE 2015-12-21 17:52:00 +01:00
commit 3ea381413f
45 changed files with 345 additions and 162 deletions

View file

@ -12,7 +12,7 @@ development:
test:
adapter: postgresql
encoding: unicode
database: tps_test
database: tps_test<%= ENV['TEST_ENV_NUMBER'] %>
host: localhost
pool: 5
username: tps

View file

@ -15,8 +15,10 @@ Rails.application.routes.draw do
root 'root#index'
get 'france_connect' => 'france_connect#login'
get 'france_connect/callback' => 'france_connect#callback'
namespace :france_connect do
get 'entreprise' => 'entreprise#login'
get 'entreprise/callback' => 'entreprise#callback'
end
get 'demo' => 'demo#index'