Upgrade jruby with some significant fixes, especially one for FreeBSD…

… 10. http://jruby.org/2014/04/15/jruby-1-7-12.html
ari · Apr 17, 2014 · 47e5c25 · 47e5c25
1 parent 9d62f76
commit 47e5c25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-jruby-1.7.11
+jruby-1.7.12
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jruby-jars (1.7.11)
+    jruby-jars (1.7.12)
     jruby-rack (1.1.14)
     jruby-rack-worker (0.10.0)
       jruby-rack (>= 1.1.10)