Merge lp:~linaro-infrastructure/linaro-license-protection/openid-django into lp:~linaro-automation/linaro-license-protection/trunk
Proposed by
Stevan Radaković
| Status: | Rejected |
|---|---|
| Rejected by: | Данило Шеган |
| Proposed branch: | lp:~linaro-infrastructure/linaro-license-protection/openid-django |
| Merge into: | lp:~linaro-automation/linaro-license-protection/trunk |
| Prerequisite: | lp:~linaro-infrastructure/linaro-license-protection/merge-django-into-trunk |
| Diff against target: |
0 lines
Conflict adding files to license_protected_downloads. Created directory. Conflict because license_protected_downloads is not versioned, but has versioned children. Versioned directory. Contents conflict in license_protected_downloads/buildinfo.py Conflict adding files to license_protected_downloads/static. Created directory. Conflict because license_protected_downloads/static is not versioned, but has versioned children. Versioned directory. Contents conflict in license_protected_downloads/views.py Contents conflict in settings.py Conflict adding files to templates. Created directory. Conflict because templates is not versioned, but has versioned children. Versioned directory. Contents conflict in templates/dir_template.html Contents conflict in templates/header.html Contents conflict in urls.py |
| To merge this branch: | bzr merge lp:~linaro-infrastructure/linaro-license-protection/openid-django |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Данило Шеган (community) | Disapprove | ||
| Paul Sokolovsky | Approve | ||
|
Review via email:
|
|||
Description of the change
OpenID support for linaro-
It depends on django refactoring from mentioned branch below.
It includes changes to the django view file and a new class to support OpenId Auth.
Unit tests included.
To post a comment you must log in.
Revision history for this message
| Paul Sokolovsky (pfalcon) wrote | # |
Revision history for this message
| Stevan Radaković (stevanr) wrote | # |
Revision history for this message
| Stevan Radaković (stevanr) wrote | # |
Revision history for this message
| Данило Шеган (danilo) wrote | # |
As was discussed and agreed yesterday with James and Stevan, this was already merged in yesterday, to have common review of the entire django-based implementation.