diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-28 14:21:55 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-28 14:21:55 +0100 |
| commit | 9d17018f47f219669ab9cb649c6bea4f258ab1ab (patch) | |
| tree | b4dfa91e03af05a1bd053918335f03b5e1fa2917 | |
| parent | ed7d4517d86358a17a93250aef67458ab9ce2436 (diff) | |
Further tweaks to support Travis
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 1 | ||||
| -rw-r--r-- | config/database.yml-test | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index a19af8e6a..56d32e1bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: ruby +branches: + only: + - release/0.6.2 rvm: - 1.8.7 before_install: @@ -39,6 +39,7 @@ gem 'zip' group :test do gem 'fakeweb' gem 'rspec-rails', '~> 1.3.4' + gem 'rake' end group :develop do diff --git a/Gemfile.lock b/Gemfile.lock index cf9dedb44..0d9d5cc1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ DEPENDENCIES pg rack (~> 1.1.0) rails (= 2.3.14) + rake rdoc (~> 2.4.3) recaptcha (~> 0.3.1) rmagick diff --git a/config/database.yml-test b/config/database.yml-test new file mode 100644 index 000000000..ff6e2013a --- /dev/null +++ b/config/database.yml-test @@ -0,0 +1,4 @@ +test: + adapter: postgresql + database: foi_test + username: postgres |