Merge branch 'master' of github.com:lunich/table_for

brain-geek · Nov 17, 2011 · 3e74f97 · 3e74f97
2 parents f4b722b + 042b0aa
commit 3e74f97
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-2.0
+  - jruby
+
+branches:
+  only:
+    - master
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,9 @@ source :gemcutter
 gem "actionpack"
 
 group :development, :test do
+  gem "rake"
   gem "rspec"
+
   gem "webrat"
   #gem 'ruby-debug19', :platforms => :ruby_19
   gem 'ruby-debug', :platforms => :ruby_18

diff --git a/README.rdoc b/README.rdoc
@@ -1,3 +1,5 @@
+{<img src="http://travis-ci.org/Ptico/table_for" />}[http://travis-ci.org/Ptico/table_for]
+
 == Description
 
 table_for_collection is a simple gem used to render tables based on the given collection.

diff --git a/autotest/discover.rb b/autotest/discover.rb