Skip to content

Commit cf4a986

Browse files
authored
Merge pull request #112 from m0nad/dependabot/bundler/jbuilder-2.11.1
Bump jbuilder from 2.10.1 to 2.11.1
2 parents 70f2b69 + 8b2a53e commit cf4a986

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ gem 'jquery-rails'
1919
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
2020
gem 'turbolinks'
2121
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
22-
gem 'jbuilder', '~> 2.10'
22+
gem 'jbuilder', '~> 2.11'
2323
# bundle exec rake doc:rails generates the API under doc/api.
2424
gem 'sdoc', '~> 2.0.3', group: :doc
2525

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ GEM
8181
coffee-script-source
8282
execjs
8383
coffee-script-source (1.12.2)
84-
concurrent-ruby (1.1.7)
84+
concurrent-ruby (1.1.8)
8585
connection_pool (2.2.3)
8686
crass (1.0.6)
8787
draper (4.0.1)
@@ -99,7 +99,7 @@ GEM
9999
activesupport (>= 4.2.0)
100100
i18n (1.8.7)
101101
concurrent-ruby (~> 1.0)
102-
jbuilder (2.10.1)
102+
jbuilder (2.11.1)
103103
activesupport (>= 5.0.0)
104104
jquery-datatables-rails (3.4.0)
105105
actionpack (>= 3.1)
@@ -237,7 +237,7 @@ DEPENDENCIES
237237
coffee-rails
238238
draper (= 4.0.1)
239239
font-awesome-sass
240-
jbuilder (~> 2.10)
240+
jbuilder (~> 2.11)
241241
jquery-datatables-rails
242242
jquery-rails
243243
puma

0 commit comments

Comments
 (0)