From b56455bf1ff080a5616bf17b91721836a8ec2482 Mon Sep 17 00:00:00 2001
From: Pavel Pravosud <pavel@pravosud.com>
Date: Mon, 30 May 2016 14:10:00 -0700
Subject: [PATCH] Version 2.5.0

---
 CHANGELOG.md     | 5 +++++
 jbuilder.gemspec | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e575b..601eda6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+2.5.0
+-----
+
+* [Rails 5 compatibility](https://github.com/rails/jbuilder/commit/64c510ec69d9e63b73ffd5942e802d21a7d14701)
+
 2.4.1
 -----
 
diff --git a/jbuilder.gemspec b/jbuilder.gemspec
index 0522984..fbd487d 100644
--- a/jbuilder.gemspec
+++ b/jbuilder.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.4.1'
+  s.version  = '2.5.0'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'