Skip to content

Commit

Permalink
for heroku deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
hlee committed Jun 23, 2013
1 parent d2c8e03 commit 4389aca
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ gem 'rails', '3.2.13'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'sqlite3'
gem "slim-rails"
gem 'omniauth-github'
gem 'devise'
gem 'pg', group: [:production]


# Gems used only for assets and not required
Expand All @@ -27,6 +27,7 @@ end
gem 'jquery-rails'

group :development, :test do
gem 'sqlite3'
gem 'rspec-rails'
gem 'jasmine'
gem 'factory_girl_rails'
Expand Down
14 changes: 11 additions & 3 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ test:
timeout: 5000

production:
adapter: sqlite3
database: db/production.sqlite3
adapter: postgresql
encoding: unicode
database: test-postgres_production
host: localhost
pool: 5
timeout: 5000
username: postgres
password: postgres
#production:
#adapter: sqlite3
#database: db/production.sqlite3
#pool: 5
#timeout: 5000

0 comments on commit 4389aca

Please sign in to comment.