Commit 8f95e973 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Bump json 

json 1.8.3 was incompatible with ruby 2.4.0

closes #7285
parent 451e6087

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.1.7" 
# API and JSON



gem "acts_as_api", "0.4.3"

gem "json",        "1.8.3"

gem "json",        "1.8.6"

gem "json-schema", "2.7.0"



# Authentication

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ GEM 
      sprockets-rails

    js_image_paths (0.1.0)

      rails (~> 4.0)

    json (1.8.3)

    json (1.8.6)

    json-jwt (1.6.3)

      activesupport

      bindata
@@ -954,7 +954,7 @@ DEPENDENCIES 
  jquery-ui-rails (= 5.0.5)

  js-routes (= 1.2.9)

  js_image_paths (= 0.1.0)

  json (= 1.8.3)

  json (= 1.8.6)

  json-schema (= 2.7.0)

  json_spec (= 1.1.4)

  leaflet-rails (= 0.7.7)