Skip to content

Commit

Permalink
Merge branch '7.x-1.x' of github.com:RESTful-Drupal/restful into 355-…
Browse files Browse the repository at this point in the history
…Bad_Hal
  • Loading branch information
David Diers committed Mar 6, 2015
2 parents ce7eeb2 + 3ac61a6 commit 29966be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ before_script:
- curl -O https://www.drupal.org/files/issues/2086225-entity-access-check-node-create-3.patch
- patch -p1 /home/travis/build/restful/drupal/sites/all/modules/entity/modules/callbacks.inc < 2086225-entity-access-check-node-create-3.patch

- curl -O https://www.drupal.org/files/issues/2264079-entity-wrapper-access-single-entity-reference-2.patch
- patch -p1 /home/travis/build/restful/drupal/sites/all/modules/entity/includes/entity.wrapper.inc < 2264079-entity-wrapper-access-single-entity-reference-2.patch

# start a web server on port 8080, run in the background; wait for initialization
- drush runserver 127.0.0.1:8080 &
- until netstat -an 2>/dev/null | grep '8080.*LISTEN'; do true; done
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ control.

## Module dependencies

* [Entity API](https://drupal.org/project/entity), with the following patches:
* [$wrapper->access() might be wrong for single entity reference field](https://www.drupal.org/node/2264079#comment-8911637)
* [Entity API](https://drupal.org/project/entity), with the following patch:
* [Prevent notice in entity_metadata_no_hook_node_access() when node is not saved](https://drupal.org/node/2086225#comment-8768373)

## Recipes
Expand Down

0 comments on commit 29966be

Please sign in to comment.