Permalink
Switch branches/tags
Nothing to show
Commits on Aug 8, 2012
  1. Merge pull request #34 from bigjason/activerecordfix

    dhh committed Aug 8, 2012
    Detect query like objects
  2. Merge branch 'master' of git://github.com/rails/jbuilder into activer…

    bigjason committed Aug 8, 2012
    …ecordfix
    
    Conflicts:
    	test/jbuilder_test.rb
  3. Merge pull request #48 from SamSaffron/master

    dhh committed Aug 8, 2012
    The errors I am getting when my view blows up is making me want to kill clowns
  4. Merge pull request #23 from bigjason/nestable-jbuilder

    dhh committed Aug 8, 2012
    Allow nesting of Jbuilder objects
  5. Merge pull request #37 from bigjason/camelize

    dhh committed Aug 8, 2012
    Alternate more generalized implementation for "Add support for optional auto-camelization"
  6. Merge pull request #47 from fcheung/master

    dhh committed Aug 8, 2012
    Use multijson for serialization
Commits on Jul 24, 2012
  1. the errors you get back are totally cryptic since the source is inclu…

    SamSaffron committed Jul 24, 2012
    …ded twice, this patch keeps the lines aligned that in turn ensure you get the correct error line numbers.
Commits on Jun 14, 2012
  1. use multijson for serialization

    fcheung committed Jun 14, 2012
Commits on May 22, 2012
  1. Fix documentation.

    bigjason committed May 22, 2012
    Thanks to @jejacks0n for catching this.
Commits on May 11, 2012
Commits on Apr 23, 2012
  1. Add global key_format configuration.

    bigjason committed Apr 23, 2012
    Just call Jbuilder.key_format with the same settings you call the
    instance version and it will be used as a default.
  2. Fix missing instance variable

    bigjason committed Apr 23, 2012
  3. Add key_format! functionality

    bigjason committed Apr 23, 2012
    This is a more general implementation for issue #13.
Commits on Apr 4, 2012
  1. Detect query like objects

    bigjason committed Apr 4, 2012
    This is a patch for issue #19.  It allows `ActiveRecord::Relation` like
    objects to be used directly without needing to call `to_a`.
Commits on Mar 29, 2012
Commits on Mar 24, 2012
Commits on Mar 23, 2012
  1. Bump version

    dhh committed Mar 23, 2012
  2. Merge pull request #14 from pctj101/master

    dhh committed Mar 23, 2012
    Updated README.md to talk about needing Ruby 1.9 block local variables.
  3. Merge pull request #17 from anithri/master

    dhh committed Mar 23, 2012
    Update README.md file with short example of #array!
  4. Merge pull request #27 from lagartoflojo/master

    dhh committed Mar 23, 2012
    Fix readme on partial! usage.
  5. Merge pull request #29 from backspace/patch-1

    dhh committed Mar 23, 2012
    Fix typo in JSON output
  6. Merge pull request #21 from bigjason/master

    dhh committed Mar 23, 2012
    Handle `false` and `nil` values correctly.
  7. Merge pull request #26 from AquaGeek/patch-1

    dhh committed Mar 23, 2012
    Fix minor typo in Readme
Commits on Mar 4, 2012
  1. Fix typo in JSON output

    backspace committed Mar 4, 2012
Commits on Feb 26, 2012
  1. Missing commas.

    lagartoflojo committed Feb 26, 2012
  2. Explain how to use partial!

    lagartoflojo committed Feb 26, 2012
  3. Clarify partial usage

    lagartoflojo committed Feb 26, 2012
Commits on Feb 21, 2012
  1. Fix minor typo in Readme

    AquaGeek committed Feb 21, 2012
Commits on Feb 15, 2012
  1. Allow nesting of Jbuilder objects

    bigjason committed Feb 15, 2012
    Small change that detects when another jbuilder object is being added.
    This allows a higher degree of code reuse.
Commits on Feb 9, 2012
  1. Merge pull request #1 from thisduck/master

    bigjason committed Feb 9, 2012
    Added a test for the nil value