Merge pull request #1657 from internetee/upgrade-json-to-2.3

Upgrade sdoc to 1.1, JSON to 2.3.1

Gemfile

@@ -81,10 +81,10 @@ end
 
 group :development, :test do
   gem 'pry', '0.10.1'
-  gem 'sdoc',          '0.4.1'  # bundle exec rake doc:rails generates the API under doc/api.
   gem 'railroady',     '1.3.0'  # to generate database diagrams
   gem 'autodoc'
   gem 'puma'
+  gem 'sdoc', '~> 1.1'
 end
 
 group :test do

Gemfile.lock

@@ -253,7 +253,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (1.8.6)
+    json (2.3.1)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -377,7 +377,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbtree3 (0.6.0)
-    rdoc (4.3.0)
+    rdoc (6.2.1)
     regexp_parser (1.7.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -423,9 +423,8 @@ GEM
       nokogiri (>= 1.8.1)
       nori (~> 2.4)
       wasabi (~> 3.4)
-    sdoc (0.4.1)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
+    sdoc (1.1.0)
+      rdoc (>= 5.0)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
     selectize-rails (0.12.1)
@@ -545,7 +544,7 @@ DEPENDENCIES
   ransack (~> 2.3)
   rest-client
   sass-rails
-  sdoc (= 0.4.1)
+  sdoc (~> 1.1)
   select2-rails (= 3.5.9.3)
   selectize-rails (= 0.12.1)
   simplecov (= 0.17.1)