diff --git a/Gemfile b/Gemfile index 9dada4f..674e5eb 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'jquery-rails', '~> 4.3.5' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks', '~> 5.2.1' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.9.1' +gem 'jbuilder', '~> 2.10.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 1.0.0', group: :doc diff --git a/Gemfile.lock b/Gemfile.lock index 66a9e74..1de90e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,10 +100,10 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) hashie (3.6.0) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) - jbuilder (2.9.1) - activesupport (>= 4.2.0) + jbuilder (2.10.0) + activesupport (>= 5.0.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -121,7 +121,7 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) msgpack (1.3.1) multi_json (1.14.1) multi_xml (0.6.0) @@ -217,7 +217,7 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -249,7 +249,7 @@ DEPENDENCIES diff-lcs diffy font-awesome-sass (~> 5.12.0) - jbuilder (~> 2.9.1) + jbuilder (~> 2.10.0) jquery-rails (~> 4.3.5) mysql2 (~> 0.5.2) omniauth