Commit 6bad75a753db28f6d6c229b77e8670989a572147
1 parent
84355ff9
Exists in
master
and in
1 other branch
revert Gemfile sources change
Showing
3 changed files
with
8 additions
and
7 deletions
Show diff stats
Gemfile
Gemfile.lock
| 1 | GEM | 1 | GEM |
| 2 | - remote: http://rubygems.org/ | ||
| 3 | - remote: http://gems.github.com/ | 2 | + remote: https://www.rubygems.org/ |
| 4 | specs: | 3 | specs: |
| 5 | actionmailer (2.3.18) | 4 | actionmailer (2.3.18) |
| 6 | actionpack (= 2.3.18) | 5 | actionpack (= 2.3.18) |
| @@ -77,6 +76,7 @@ GEM | @@ -77,6 +76,7 @@ GEM | ||
| 77 | activesupport | 76 | activesupport |
| 78 | sendgrid (0.1.4) | 77 | sendgrid (0.1.4) |
| 79 | shoulda (2.10.3) | 78 | shoulda (2.10.3) |
| 79 | + sqlite3 (1.3.8) | ||
| 80 | term-ansicolor (1.0.7) | 80 | term-ansicolor (1.0.7) |
| 81 | test-unit (1.2.3) | 81 | test-unit (1.2.3) |
| 82 | hoe (>= 1.5.1) | 82 | hoe (>= 1.5.1) |
| @@ -123,6 +123,7 @@ DEPENDENCIES | @@ -123,6 +123,7 @@ DEPENDENCIES | ||
| 123 | rubaidh-google_analytics (= 1.1.4) | 123 | rubaidh-google_analytics (= 1.1.4) |
| 124 | sendgrid (= 0.1.4) | 124 | sendgrid (= 0.1.4) |
| 125 | shoulda (~> 2.10.1) | 125 | shoulda (~> 2.10.1) |
| 126 | + sqlite3 | ||
| 126 | test-unit (= 1.2.3) | 127 | test-unit (= 1.2.3) |
| 127 | thoughtbot-clearance (= 0.8.2) | 128 | thoughtbot-clearance (= 0.8.2) |
| 128 | webrat (= 0.5.3) | 129 | webrat (= 0.5.3) |
config/database.yml
| @@ -6,10 +6,11 @@ development: &default | @@ -6,10 +6,11 @@ development: &default | ||
| 6 | database: rebirth_development | 6 | database: rebirth_development |
| 7 | pool: 5 | 7 | pool: 5 |
| 8 | timeout: 5000 | 8 | timeout: 5000 |
| 9 | + password: r3dfr0g | ||
| 9 | 10 | ||
| 10 | test: &test | 11 | test: &test |
| 11 | - <<: *default | ||
| 12 | - database: pairwise_test | 12 | + adapter: sqlite3 |
| 13 | + database: db/test.sqlite3 | ||
| 13 | 14 | ||
| 14 | cucumber: | 15 | cucumber: |
| 15 | <<: *test | 16 | <<: *test |