Pull requests

#6 Open
Repository
fcurella fcurella
Branch
views
Repository
ubernostrum ubernostrum
Branch
default

Replaced `profile_list` view with a class-based view. This will change the requirement to django >=1.4 and require a MAJOR version bump.

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 default
hg pull -r views https://bitbucket.org/fcurella/django-profiles
hg merge views
hg commit -m 'Merged in fcurella/django-profiles/views (pull request #6)'
Author
  1. Flavio Curella avatarFlavio Curella
Reviewers
Description
No description

Comments (5)

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.