From 6bad75a753db28f6d6c229b77e8670989a572147 Mon Sep 17 00:00:00 2001 From: Ábner Silva de Oliveira Date: Thu, 6 Feb 2014 13:41:14 -0300 Subject: [PATCH] revert Gemfile sources change --- Gemfile | 5 ++--- Gemfile.lock | 5 +++-- config/database.yml | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 0993a7d..ef8e496 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ -source 'https://www.rubygems.org' -#source :rubygems -#source "http://gems.github.com" +source :rubygems +source "http://gems.github.com" gem "rake", "~> 0.9.2.2" gem "rdoc", "~> 3.12" diff --git a/Gemfile.lock b/Gemfile.lock index 421aaf1..7fea913 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,5 @@ GEM - remote: http://rubygems.org/ - remote: http://gems.github.com/ + remote: https://www.rubygems.org/ specs: actionmailer (2.3.18) actionpack (= 2.3.18) @@ -77,6 +76,7 @@ GEM activesupport sendgrid (0.1.4) shoulda (2.10.3) + sqlite3 (1.3.8) term-ansicolor (1.0.7) test-unit (1.2.3) hoe (>= 1.5.1) @@ -123,6 +123,7 @@ DEPENDENCIES rubaidh-google_analytics (= 1.1.4) sendgrid (= 0.1.4) shoulda (~> 2.10.1) + sqlite3 test-unit (= 1.2.3) thoughtbot-clearance (= 0.8.2) webrat (= 0.5.3) diff --git a/config/database.yml b/config/database.yml index e1ddcb1..e50e572 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,10 +6,11 @@ development: &default database: rebirth_development pool: 5 timeout: 5000 + password: r3dfr0g test: &test - <<: *default - database: pairwise_test + adapter: sqlite3 + database: db/test.sqlite3 cucumber: <<: *test -- libgit2 0.21.2