Permalink
Commits on May 22, 2012
  1. Merge branch 'master' of github.com:agworld/grape

    Conflicts:
    	lib/grape/entity.rb
    Jason Hutchens committed May 22, 2012
  2. explicitly call as_json on Array objects

    Jason Hutchens committed Feb 28, 2012
Commits on May 5, 2012
  1. Merge pull request #171 from bowsersenior/patch-1

    Fix a little typo in the README
    Michael Bleigh committed May 5, 2012
Commits on Apr 30, 2012
  1. Merge pull request #166 from allenwei/master

    Add redirect feature
    dblock committed Apr 30, 2012
  2. use hash argument in redirect

    allenwei committed Apr 30, 2012
Commits on Apr 25, 2012
  1. Merge pull request #168 from netmask/master

    Goliath sends symbols in the header hash
    dblock committed Apr 25, 2012
  2. Merge pull request #169 from whiteley/silence_multijson_warnings

    Silence multi_json deprecation warnings
    dblock committed Apr 25, 2012
  3. Silence multi_json deprecation warnings

    Matt Whiteley committed Apr 25, 2012
Commits on Apr 22, 2012
  1. * Fix: Formatter can parse symbol keys in the headers hash

    * Added: Formatter hash test
    Jonathan Garay committed Apr 22, 2012
  2. * Fix: formatter try to evaluate the headers sym_links hash keys as s…

    …tring
    Jonathan Garay committed Apr 22, 2012
Commits on Apr 17, 2012
  1. Add redirect feature

    allenwei committed Apr 17, 2012
Commits on Apr 4, 2012
  1. Merge pull request #159 from gaiottino/master

    Adding :requirements to routes so it's possible to use periods etc in path
    Michael Bleigh committed Apr 4, 2012
Commits on Apr 3, 2012
  1. Merge pull request #157 from bobbytables/format-with-1.8

    Change time creation to adhere to ruby 1.8.
    Michael Bleigh committed Apr 3, 2012
Commits on Apr 1, 2012
  1. Merge pull request #156 from bobbytables/entity-format-with

    Entity format with
    Michael Bleigh committed Apr 1, 2012
Commits on Mar 31, 2012
Commits on Mar 29, 2012
  1. Merge pull request #154 from codemancode/master

    simple typo
    Michael Bleigh committed Mar 29, 2012
  2. fixed spelling typo

    mtmcfarl committed Mar 29, 2012
Commits on Mar 28, 2012
  1. Bumps version to v0.2.0

    Michael Bleigh committed Mar 28, 2012
  2. Update RSpec dependency, add 1.9.3 to Travis

    Michael Bleigh committed Mar 28, 2012
  3. Merge pull request #151 from bobbytables/frontier-exposure-inheritance

    Exposure Inheritance
    Michael Bleigh committed Mar 28, 2012
Commits on Mar 18, 2012
  1. Merge pull request #143 from dblock/frontier-mount-docs

    Frontier: Updated README on versioning, mounting, etc.
    dblock committed Mar 18, 2012
  2. Fixed 1.8.7 ruby spec.

    dblock committed Mar 18, 2012
  3. Merged from upstream.

    dblock committed Mar 18, 2012
  4. Merge pull request #147 from dblock/frontier-default-format

    Frontier: enable default_format to actually do something
    dblock committed Mar 18, 2012