Merge branch 'rimenes-travis-ci'

.ruby-version

@@ -1 +1 @@
-2.0.0-p353 
+2.1.5

.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.0.0
+
+before_script:
+  - cp config/database.travis.yml config/database.yml
+  - bundle exec rake db:create db:migrate db:test:prepare
+
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.0.0'
+ruby '2.1.5'
 
 gem 'rails', '>= 3.2.13'
 gem 'jquery-rails'

README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/lucianot/dealbook.svg?branch=master)](https://travis-ci.org/lucianot/dealbook)
+
+[travis]: http://travis-ci.org/lucianot/dealbook
+
 Welcome to Dealbook
 ===================
 

config/application.rb

@@ -49,7 +49,7 @@ class Application < Rails::Application
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
-    config.active_record.schema_format = :ruby
+    config.active_record.schema_format = :sql
 
     # Enforce whitelist mode for mass assignment.
     # This will create an empty whitelist of attributes available for mass-assignment for all models

config/database.travis.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: postgresql
+  database: travis_ci_test
+  username: postgres

db/structure.sql

@@ -3,6 +3,7 @@
 --
 
 SET statement_timeout = 0;
+SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;