Pull requests

#24 Open
Repository
stephenpaulger stephenpaulger
Branch
default
Repository
jespern jespern
Branch
default

Alterations to fixtures.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/stephenpaulger/django-piston
Author
  1. Stephen Paulger avatarStephen Paulger
Reviewers
Description

Allow fixtures to be installed to allow Django tests to pass.

Move the models.json to pistonmodels.json to reduce the risk of conflicting with other apps with similarly named fixtures.

Comments (0)

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.