aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-15 05:51:09 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-15 05:51:09 -0700
commitbe4fac3c0ce80b8a739bba21dba6ac6c1eca9987 (patch)
treefd22b1fef2ad00ca64f73a86bf302c6eb660735b
parent1fb25b719d869a755952531e4b16902347233c25 (diff)
parentf50459000a2b28d38134495e2c3b81a2e3aba1f9 (diff)
downloadrails-be4fac3c0ce80b8a739bba21dba6ac6c1eca9987.tar.gz
rails-be4fac3c0ce80b8a739bba21dba6ac6c1eca9987.tar.bz2
rails-be4fac3c0ce80b8a739bba21dba6ac6c1eca9987.zip
Merge pull request #10955 from arunagw/jruby_json_not_required
'json' gem is no more required under JRuby
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b0f91c6dac..13bee8ee5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,6 @@ platforms :ruby do
end
platforms :jruby do
- gem 'json'
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7'
group :db do