Launchpad itself

Merge ~twom/launchpad:affirm-code-of-conduct into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. affirm-code-of-conduct
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Colin Watson
Approved revision: 92abb97d8c454eae24961b12e5545fb50e9264f8
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:affirm-code-of-conduct
Merge into: launchpad:master
Diff against target: 412 lines (+239/-4)
10 files modified
lib/lp/registry/browser/codeofconduct.py (+36/-0)
lib/lp/registry/browser/configure.zcml (+7/-0)
lib/lp/registry/browser/tests/test_codeofconduct.py (+24/-0)
lib/lp/registry/emailtemplates/signedcoc-affirmed.txt (+11/-0)
lib/lp/registry/interfaces/codeofconduct.py (+13/-0)
lib/lp/registry/model/codeofconduct.py (+55/-1)
lib/lp/registry/templates/codeofconduct-list.pt (+12/-2)
lib/lp/registry/templates/person-codesofconduct.pt (+6/-1)
lib/lp/registry/templates/signedcodeofconduct-affirm.pt (+20/-0)
lib/lp/registry/tests/test_codeofconduct.py (+55/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+406461@code.staging.launchpad.net

Commit message

Add affirmation of Code of Conduct

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) wrote :

Affirmation screen: https://people.canonical.com/~tomwardill/affirmation-screen.png
Code of Conduct screen: https://people.canonical.com/~tomwardill/code-of-conduct.png

Revision history for this message
Colin Watson (cjwatson) :
review: Needs Fixing
Revision history for this message
Colin Watson (cjwatson) wrote :

Also, two things from looking at your screenshots:

 * I wonder if the affirmation checkbox should be more ... affirmative, overriding the description of the `affirmed` attribute in the interface. How about something like "I agree to this code of conduct.", remove the bold "Affirmed" title, and change the "Continue" button to "Affirm"?

 * Your "Active signatures" screenshot shows that you have multiple affirmations of the same version. This seems like something that we generally shouldn't allow.

Revision history for this message
Colin Watson (cjwatson) wrote :

I created https://warthogs.atlassian.net/browse/LP-181 for the backfill task.

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/1842/

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/1843/

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/1844/

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: