aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-02-03 17:01:53 -0200
committerRafael França <rafaelmfranca@gmail.com>2016-02-03 17:01:53 -0200
commit12bdda74d3f1f4069ddb3289a6e4feb6a63c0302 (patch)
tree3dc8b714b97fc49c0b51c3dcbf8d1b3dd6c3ba13 /Gemfile
parent8a84f1c047ebb59dec7a7ece9355da9c7b0ae6b7 (diff)
parentf3433f7c757ef8352c3ea3796a9b350b4454a2b6 (diff)
downloadrails-12bdda74d3f1f4069ddb3289a6e4feb6a63c0302.tar.gz
rails-12bdda74d3f1f4069ddb3289a6e4feb6a63c0302.tar.bz2
rails-12bdda74d3f1f4069ddb3289a6e4feb6a63c0302.zip
Merge pull request #23453 from mperham/remove_json
Remove json gem dependency
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 78f9853bed..ba102fe711 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,6 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
end
platforms :jruby do
- gem 'json'
if ENV['AR_JDBC']
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
group :db do