Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ruby-grape/grape-entity
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ruby-grape/grape-entity
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0-4
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 9 files changed
  • 2 contributors

Commits on Aug 3, 2015

  1. Fix: entity instance methods exposure. 

    This one fixes a regression introduced in #147: entity instance methods
were exposed with `NoMethodError`.
Fixes #163. Additional specs are added.
    @marshall-lee
    marshall-lee committed Aug 3, 2015
    Copy the full SHA
    52be44a View commit details

  2. Merge pull request #164 from marshall-lee/fix_entity_private_methods_… 

    …regression

Fix: entity instance methods exposure (0.4)
    @marshall-lee
    marshall-lee committed Aug 3, 2015
    Copy the full SHA
    7235364 View commit details

Commits on Aug 10, 2015

  1. Intridea -> ruby-grape. 

    Conflicts:
	CHANGELOG.md
    @dblock @marshall-lee
    dblock authored and marshall-lee committed Aug 10, 2015
    Copy the full SHA
    9bf1af0 View commit details

  2. Allow global settings on Grape::Entity. 

    This fixes a regression introduced after merging a #134.
It's something undocumented before but it worked before and I don't see
anything harmful in the presence of this feature.

Fixes #166.
    @marshall-lee
    marshall-lee committed Aug 10, 2015
    Copy the full SHA
    056a0e8 View commit details

  3. Merge pull request #167 from marshall-lee/fix_global_settings 

    Allow global settings on Grape::Entity (0.4.x)
    @dblock
    dblock committed Aug 10, 2015
    Copy the full SHA
    6e0bc05 View commit details
Loading