diff --git a/Gemfile b/Gemfile index 7fb4c71d8..31a18ab75 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "google-api-client", "~> 0.29" # Client for accessing Google APIs gem "html_truncator", "~> 0.4" # Truncate an HTML string properly gem "httparty", "~> 0.16" # Makes http fun! Also, makes consuming restful web services dead easy gem "inline_svg", "~> 1.4" # Embed SVG documents in your Rails views and style them with CSS -gem "jbuilder", "~> 2.8" # Create JSON structures via a Builder-style DSL +gem "jbuilder", "~> 2.9" # Create JSON structures via a Builder-style DSL gem "jquery-rails", "~> 4.3" # A gem to automate using jQuery with Rails gem "kaminari", "~> 1.1" # A Scope & Engine based, clean, powerful, customizable and sophisticated paginator gem "liquid", "~> 4.0" # A secure, non-evaling end user template engine with aesthetic markup diff --git a/Gemfile.lock b/Gemfile.lock index b9318f7e4..a2f2541b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -424,9 +424,8 @@ GEM nokogiri (>= 1.6) ipaddress (0.8.3) jaro_winkler (1.5.2) - jbuilder (2.8.0) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) jmespath (1.4.0) jquery-fileupload-rails (0.4.7) actionpack (>= 3.1) @@ -882,7 +881,7 @@ DEPENDENCIES html_truncator (~> 0.4) httparty (~> 0.16) inline_svg (~> 1.4) - jbuilder (~> 2.8) + jbuilder (~> 2.9) jquery-rails (~> 4.3) kaminari (~> 1.1) launchy (~> 2.4)