@ -5,7 +5,14 @@ gem 'rails', '3.1.0'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
group :development do
end
group :production do
gem 'pg'
gem 'devise', '~> 1.4.5'
#gem 'cancan', '~> 1.6.5'
#gem "meta_where", "~> 1.0" # squeel ?
@ -98,6 +98,7 @@ GEM
multi_json (1.0.3)
nokogiri (1.5.0)
orm_adapter (0.0.5)
pg (0.11.0)
pjax-rails (0.1.4)
jquery-rails
polyglot (0.3.2)
@ -187,6 +188,7 @@ DEPENDENCIES
devise (~> 1.4.5)
factory_girl_rails (~> 1.2)
pg
pjax-rails (~> 0.1.4)
rails (= 3.1.0)
rspec-rails (~> 2.6.1)
@ -19,7 +19,10 @@ test:
timeout: 5000
production:
adapter: sqlite3
database: db/production.sqlite3
pool: 5
encoding: unicode
adapter: postgresql
username: username
port: 5432
host: hostname
database: database
password: password