One of the things we talked about at the Core Developer Summit was expanding #720670: Figure out wording of the "Yes, I promise to upload GPLv2+ code" checkbox to also cover a "Developer Code of Conduct", basically similar to our CVS application requirements. Probably mentioning things like "collaboration over competition", "adherence to coding standards", and so on.

Comments

pwolanin’s picture

What are the essential things?

I promise to only push GPL v2+ code
I will cooperate with the Drupal Security Team as needed
I will treat people with respect in the issue queues
I agree to the Drupal Code Repository TOS. http://drupalcode.org/viewvc/drupal/contributions/TERMS.txt?view=co

It would be nice to limit this to ~4 checkboxes with a line of text (+link) for each.

I don't think collaboration, coding standards, or anything similar should be a bar to pushing code to a git repo.

webchick’s picture

Project: Drupal.org infrastructure » The Great Git Migration
Component: Git » Commit access process

Moving to The Great Git Migration project, since it's not directly related to infrastructure.

webchick’s picture

Assigned: Unassigned » sdboyer
Issue tags: +git sprint 1

There was a discussion about this at DCCPH needs summarizing.

rfay’s picture

Continuing on from @pwolanin's #1:

I will "Step down considerately", from DCOC.

Otherwise, it seems to me basically that he has it.

zzolo’s picture

So, I agree, I think it is best to keep this to a minimal agreement with some links. I would suggest the following:

  • Keep to one checkbox with a list of items.
  • Keep the wording consisten where applicable: "I will ..."
  • Run by legal team?

Suggestion for wording:

I will only commit GPL v2+ code and resources to the Drupal code repository.
I will cooperate with the Drupal Security Team as needed.
I will adhere to and have read the Drupal Code of Conduct.
I agree to the Drupal Code Repository Terms of Service.

sdboyer’s picture

Status: Active » Needs work

I like the ideas I'm seeing here, but I feel the need to mull this over some more before making any kind of definitive recommendation.

sdboyer’s picture

Status: Needs work » Needs review

OK yep, I'm happy with what zzolo has laid out in #5. If it passes muster with legal, let's make it definitive.

eliza411’s picture

Assigned: sdboyer » eliza411

I'm assigning this to me until legal agrees to look this over.

Crell’s picture

Issue tags: +Legal

Well then tag it for Legal. :-)

I'll have a closer look soon. I'm at work at the moment.

Crell’s picture

A few tweaks to the language above:

I will only commit GPL v2+-licensed code and resources to the Drupal code repository.
I will only commit code and resources that I own or am permitted to distribute.
I will cooperate with the Drupal Security Team as needed.
I have read and will adhere to the Drupal Code of Conduct.
I agree to the Drupal Code Repository Terms of Service.

I added "-licensed" to the first item and reversing some wording in the 3rd-now-4th item. The new second point is slightly distinct from the first, and is important. If someone is working for a company that doesn't want their code distributed, the person actually writing it is not allowed to distribute it. It's mostly a formality to remind people of that fact, as well as a CYA for us.

I actually have a few quibbles with the Repo TOS, now that I read it, but that's for another thread I think.

eliza411’s picture

Assigned: eliza411 » sdboyer
Status: Needs review » Reviewed & tested by the community

Back to you, Sam. It looks ready to me.

rfay’s picture

Related discussion about privileges and how you get them in git and what they are: #703116-92: Our CVS account application requirements are obtuse and discourage contributions.

We don't seem to have captured the discussion about how git privileges will be allowed, so I tried to report it there. If there's an issue open for that in this project, we should get that over here.

eliza411’s picture

Issue tags: +git sprint 4

Tagging Sprint 4 now that we have legal oka.

eliza411’s picture

Issue tags: +git sprint 5

Tagging for consideration in git sprint 5

sdboyer’s picture

Status: Reviewed & tested by the community » Fixed

We've got our mandate, people - here are our checkboxes!

I will only commit GPL v2+-licensed code and resources to the Drupal code repository.
I will only commit code and resources that I own or am permitted to distribute.
I will cooperate with the Drupal Security Team as needed.
I have read and will adhere to the Drupal Code of Conduct.
I agree to the Drupal Code Repository Terms of Service.

Thanks, Crell. We're going to have to figure out where to put the repo ToS now, and make some tweaks to it so it's git-friendly (e.g., "The Drupal Contributions repository" won't actually exist anymore).

webchick’s picture

Er. 5 checkboxes? :(

Can't we have a textbot/bulleted list that includes all of that text and a single "I agree" button/checkbox?

(answer in IRC: "Yes". Hooray! :D)

sdboyer’s picture

And by "checkboxes" I mean "checkbox" - let's just have one checkbox for all five of those items, which can be in a bulleted list.

pwolanin’s picture

Is one checkbox enough? Seems like the top items, the code of conduct, and ToS might all deserve their own.

webchick’s picture

Well, you can't get in unless you agree to all of it. Why bother with needless extra clicking?

pwolanin’s picture

@webchick - "but I just clicked the checkbox near the top, I didn't think I was actually agreeing to the ToS..."

We are lowering the bar a lot - I'm not sure that 3 clicks is too much to ask.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

sdboyer’s picture

Issue tags: +git decisions

adding a git decisions tag to ease finding later