Permalink
Browse files

Ignores original database.yml

  • Loading branch information...
pkordel committed Mar 23, 2012
1 parent fa7e22d commit d1621fa145c4dc4019b44306fc532d4baf386546
Showing with 22 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 Gemfile
  3. +15 −0 Gemfile.lock
  4. +5 −3 config/database.yml.example
View
@@ -19,3 +19,4 @@
/db/seeds.rb.local
/spec/cassettes
/config/repository.yml
+/config/database.yml
View
@@ -67,5 +67,6 @@ gem 'bcrypt-ruby', '~> 3.0.0'
gem 'feedzirra', git: 'git@github.com:pkordel/feedzirra.git'
+gem 'capistrano'
# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
View
@@ -65,6 +65,12 @@ GEM
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.1)
builder (3.0.0)
+ capistrano (2.11.2)
+ highline
+ net-scp (>= 1.0.0)
+ net-sftp (>= 2.0.0)
+ net-ssh (>= 2.0.14)
+ net-ssh-gateway (>= 1.1.0)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -100,6 +106,7 @@ GEM
netrc (~> 0.7.1)
rest-client (~> 1.6.1)
rubyzip
+ highline (1.6.11)
hike (1.2.1)
http_parser.rb (0.5.3)
httparty (0.8.1)
@@ -128,6 +135,13 @@ GEM
multi_json (1.1.0)
multi_xml (0.4.2)
net-http-persistent (1.4.1)
+ net-scp (1.0.4)
+ net-ssh (>= 1.99.1)
+ net-sftp (2.0.5)
+ net-ssh (>= 2.0.9)
+ net-ssh (2.3.0)
+ net-ssh-gateway (1.1.0)
+ net-ssh (>= 1.99.1)
netrc (0.7.1)
nokogiri (1.5.2)
pg (0.13.2)
@@ -237,6 +251,7 @@ PLATFORMS
DEPENDENCIES
bcrypt-ruby (~> 3.0.0)
bootstrap-sass
+ capistrano
capybara
coffee-rails (~> 3.2.1)
database_cleaner
@@ -19,7 +19,9 @@ test:
timeout: 5000
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: booky
pool: 5
- timeout: 5000
+ username: deploy
+ password:

0 comments on commit d1621fa

Please sign in to comment.