Merge lp://qastaging/~dnx/ubuntu-accomplishments-web/ubuntu-accomplishments-web-editor into lp://qastaging/ubuntu-accomplishments-web
Proposed by
Denis Darii
Status: | Merged |
---|---|
Merged at revision: | 33 |
Proposed branch: | lp://qastaging/~dnx/ubuntu-accomplishments-web/ubuntu-accomplishments-web-editor |
Merge into: | lp://qastaging/ubuntu-accomplishments-web |
Diff against target: |
479 lines (+126/-106) 10 files modified
auth.py (+1/-1) editor/__init__.py (+3/-4) editor/admin.py (+1/-0) editor/management/commands/clean_rejected_proposals.py (+6/-4) editor/management/commands/import_accomplishments.py (+2/-1) editor/models.py (+4/-1) editor/tests.py (+15/-15) editor/utils.py (+87/-79) editor/views.py (+6/-1) requirements.txt (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~dnx/ubuntu-accomplishments-web/ubuntu-accomplishments-web-editor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Janos Gyerik | Pending | ||
Review via email:
|
Description of the change
Converted tabs to spaces and some PEP8 adjustments.
To post a comment you must log in.