Permalink
Browse files

Merge branch 'release/2.1.1'

  • Loading branch information...
2 parents 5cb0662 + 5402a7e commit c5a0e04deabddafe5b26c039794d98d32b180f40 @bobthecow committed Oct 10, 2012
Showing with 25 additions and 17 deletions.
  1. +6 −0 CHANGELOG.markdown
  2. +1 −1 VERSION
  3. +8 −8 genghis.php
  4. +7 −7 genghis.rb
  5. +2 −0 src/js/genghis/json.js
  6. +1 −1 src/rb/genghis/server.rb
View
@@ -1,3 +1,9 @@
+## v2.1.1
+
+ * Fix #38 — JSON rendering weirdness with empty array properties.
+ * Fix #40 — Ruby 1.8.7 regression.
+
+
## v2.1
* Fix #28 — Handle BSON BinData properly in documents and ids.
View
@@ -1 +1 @@
-2.1.0
+2.1.1
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -498,6 +498,8 @@ Genghis.JSON = {
// Is the value an array?
if (_.isArray(value)) {
if (value.length === 0) {
+ gap = mind;
+
return span('v a', '[]');
}
View
@@ -30,7 +30,7 @@ def error_response(status, message)
@genghis_version = GENGHIS_VERSION
if request.xhr?
content_type :json
- error(status, {error: message, status: status}.to_json)
+ error(status, {:error => message, :status => status}.to_json)
else
error(status, mustache('error.html.mustache'.intern))
end

0 comments on commit c5a0e04

Please sign in to comment.