Merge lp://staging/~lukasz-czyzykowski/ubuntu-recommender/upgrade-to-django-1.5 into lp://staging/ubuntu-recommender
Proposed by
Łukasz Czyżykowski
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Czyżykowski |
| Approved revision: | 96 |
| Merged at revision: | 86 |
| Proposed branch: | lp://staging/~lukasz-czyzykowski/ubuntu-recommender/upgrade-to-django-1.5 |
| Merge into: | lp://staging/ubuntu-recommender |
| Diff against target: |
294 lines (+44/-24) 13 files modified
django_project/config/main.cfg (+1/-4) django_project/urls.py (+3/-4) requirements.txt (+3/-2) src/recommender/api/__init__.py (+13/-0) src/recommender/auth.py (+4/-3) src/recommender/managers.py (+1/-1) src/recommender/models/data.py (+3/-0) src/recommender/models/recommendations.py (+3/-1) src/recommender/tests/test_api.py (+0/-2) src/recommender/tests/test_commands.py (+5/-3) src/recommender/tests/test_managers.py (+4/-2) src/recommender/tests/test_models_data.py (+3/-0) src/recommender/urls.py (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~lukasz-czyzykowski/ubuntu-recommender/upgrade-to-django-1.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Albisetti (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Upgrade to Django 1.5.1
Description of the change
Upgrade to Django 1.5.1
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1 minus a small typo.