Permalink
Browse files

Merge branch 'mongoid-3.0'

* mongoid-3.0:
  Get JRuby green, run Travis on this branch
  Get JRuby running green on this branch
  • Loading branch information...
2 parents bc96594 + b445a38 commit 4e8577da39409cc2e7ef1a24ab538c7f4e44ec6b @rmm5t rmm5t committed Jan 15, 2013
Showing with 7 additions and 0 deletions.
  1. +3 −0 .travis.yml
  2. +4 −0 Gemfile
View
@@ -0,0 +1,3 @@
+rvm:
+ - 1.9.3
+ - jruby-19mode
View
@@ -1,4 +1,8 @@
source "http://rubygems.org"
+group :development, :test do
+ gem 'json', :platforms => [:jruby]
+end
+
# Specify your gem's dependencies in carrierwave-mongoid.gemspec
gemspec

0 comments on commit 4e8577d

Please sign in to comment.