Permalink
Commits on May 10, 2017
  1. New version to drop the pessimistic upper-bound restriction on Active…

    … Support and MultiJSON to prevent future gemfile resolution deadlocks
    dhh committed May 10, 2017
Commits on May 9, 2017
  1. Fix Illformed requirement from e77e55d (#398)

    Otherwise you get this error:
    [!] There was an error parsing `Gemfile`:
    [!] There was an error while loading `jbuilder.gemspec`: Illformed requirement ["=> 1.2"]. Bundler cannot continue.
    
     #  from ~/code/jbuilder/jbuilder.gemspec:13
     #  -------------------------------------------
     #    s.add_dependency 'activesupport', '>= 3.0.0'
     >    s.add_dependency 'multi_json',    '=> 1.2'
     #
     #  -------------------------------------------
    . Bundler cannot continue.
    
     #  from ~/code/jbuilder/Gemfile:3
     #  -------------------------------------------
     #
     >  gemspec
     #
     #  -------------------------------------------
    claudiob committed with dhh May 9, 2017
  2. Drop pessimistic gem version locks

    dhh committed on GitHub May 9, 2017
Commits on Apr 28, 2017
  1. Merge pull request #397 from maschwenk/master

    Support Rails 5.1 final cut
    rafaelfranca committed on GitHub Apr 28, 2017
  2. Support Rails 5.1

    maschwenk committed Apr 28, 2017
Commits on Apr 7, 2017
Commits on Feb 24, 2017
  1. Release 2.6.3

    rafaelfranca committed Feb 24, 2017
  2. Merge pull request #389 from maclover7/jm-rails-51

    Add Rails 5.1 support to JBuilder
    rafaelfranca committed on GitHub Feb 24, 2017
Commits on Feb 23, 2017
  1. Remove Pavel from authors

    rwz committed Feb 23, 2017
  2. Loosen Rails version restriction

    Allow Rails 5.1 applications to use JBuilder.
    maclover7 committed Feb 23, 2017
  3. Merge pull request #353 from composerinteralia/raise-merge-errors

    Avoid silently overwriting with merge
    rafaelfranca committed on GitHub Feb 23, 2017
  4. Avoid silently overwriting with merge

    At the moment merge! with an array will overwrite any existing hash
    attributes. It should probably raise a MergeError. It also makes sense
    to raise this error when attempting to merge a hash into an array, or
    when trying to merge a non-hash-or-array.
    composerinteralia committed Sep 15, 2016
Commits on Feb 22, 2017
  1. Release 2.6.2

    rafaelfranca committed Feb 22, 2017
  2. Test with Ruby 2.4

    rafaelfranca committed Feb 22, 2017
Commits on Feb 21, 2017
  1. Merge pull request #387 from elenatanasoiu/remove-old-behavior-test

    Test suite update to deal with new version of mocha
    rafaelfranca committed on GitHub Feb 21, 2017
Commits on Feb 19, 2017
  1. Test suite being updated to deal with mocha

    This commit will remove a test that is no longer compatible with the new version of mocha.
    
    The previous versions of mocha would incorrectly leave "fragment_name_with_digest" as a visible method.
    In the new version, this method is removed for versions of rails 4 and above.
    Charlie Egan and Elena Tanasoiu committed with elenatanasoiu Feb 19, 2017
Commits on Feb 9, 2017
  1. Merge pull request #383 from dijonkitchen/patch-1

    Fix wording in Readme
    maclover7 committed on GitHub Feb 9, 2017
  2. Fix wording in Readme

    dijonkitchen committed on GitHub Feb 9, 2017
Commits on Feb 7, 2017
  1. Merge pull request #375 from yuki24/get-rid-of-warning

    Remove a Ruby warning that comes from lib/jbuilder/jbuilder_template.rb
    rafaelfranca committed on GitHub Feb 7, 2017
  2. Merge pull request #382 from dlackty/patch-1

    Fix link syntax in changelog
    rafaelfranca committed on GitHub Feb 7, 2017
  3. Fix link syntax in changelog

    dlackty committed on GitHub Feb 7, 2017
Commits on Feb 6, 2017
  1. Merge pull request #381 from ash106/rails-generators-whitespace

    Add newlines to Rails generator json.jbuilder templates
    rafaelfranca committed on GitHub Feb 6, 2017
Commits on Dec 14, 2016
Commits on Nov 28, 2016
  1. Merge pull request #372 from ojab/master

    Set proper type for jbuilder option to prevent a warning
    rafaelfranca committed on GitHub Nov 28, 2016
  2. Set proper type for jbuilder option to prevent a warning with Thor >=…

    … 0.19.3
    
    See erikhuda/thor#435, right now we got a warning
    >Expected string default value for '--jbuilder'; got true (boolean)
    ojab committed Nov 27, 2016
  3. Cache root (#370)

    Add cache_root! for faster root caching
    dhh committed on GitHub Nov 28, 2016
Commits on Oct 30, 2016
  1. Fix typo/wording in README.md (#367)

    This was recently changed from "massaging giant hash structures" to "messaging
    giant hash structures" in 955acd4 / #366. "Massaging," while correct, only makes
    sense in light of a somewhat less common scondary definition meaning "to
    manipulate". "Messaging" doesn't really make sense at all. Hopefully
    "manipulating" (as introduced here) is the best of all.
    davidrunger committed with rwz Oct 30, 2016
Commits on Oct 21, 2016
  1. Update README.md (#366)

    Fix typo
    heycait committed with rwz Oct 21, 2016
Commits on Oct 2, 2016
  1. Avoid warning on test (#360)

    > warning: ambiguous first argument; put parentheses or a space even after `/' operator
    thinca committed with rwz Oct 2, 2016
  2. Remove parens around assert statements

    Ref #359
    rwz committed Oct 2, 2016
Commits on Sep 16, 2016
  1. Update contribution README (#355)

    Daniel Colson committed with rwz Sep 16, 2016