Skip to content

Rebuilt -- include teams as groups#41

Merged
samrocketman merged 1 commit into
jenkinsci:masterfrom
sirosen:rebuilt-jcarsique-pr
Jul 11, 2015
Merged

Rebuilt -- include teams as groups#41
samrocketman merged 1 commit into
jenkinsci:masterfrom
sirosen:rebuilt-jcarsique-pr

Conversation

@sirosen
Copy link
Copy Markdown
Contributor

@sirosen sirosen commented Jul 10, 2015

Apologies to @jcarsique , but I think it's important that things get merged and out the door in a new release soon.
I've retained authorship information in this PR, so no worries about correct attribution.

@samrocketman has stated that once #36 is merged, he'll cut the next release.
A major impediment to merging #36 is that it conflicts with the current master.

By just cherry-picking the content-ful change and ignoring the formatting fixes, I was able to narrow that down to just two files:
src/main/java/org/jenkinsci/plugins/GithubAuthenticationToken.java
src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java

I resolved the conflicts and the result is passing the testsuite locally.
I'm now opening this as an intentional duplicate of #36 , and hoping that the tests will pass on the cloudbees jenkins server as well.

@jcarsique @sirosen
JENKINS-21331: include teams as groups
7fea114 
duplicate: JENKINS-28575

Conflicts:
	src/main/java/org/jenkinsci/plugins/GithubAuthenticationToken.java
	src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java
@jcarsique
Copy link
Copy Markdown
Contributor

jcarsique commented Jul 10, 2015

I'll be back from holidays on Monday but it's fine as is. As you said, it's
important to get things merged asap.
Thank you.
Le 11 juil. 2015 00:16, "Stephen Rosen" notifications@github.com a écrit :

Apologies to @jcarsique https://github.com/jcarsique , but I think it's
important that things get merged and out the door in a new release soon.
I've retained authorship information in this PR, so no worries about
correct attribution.

@samrocketman https://github.com/samrocketman has stated that once #36
#36 is merged,
he'll cut the next release.
A major impediment to merging #36
#36 is that it
conflicts with the current master.

By just cherry-picking the content-ful change and ignoring the formatting
fixes, I was able to narrow that down to just two files:
src/main/java/org/jenkinsci/plugins/GithubAuthenticationToken.java
src/main/java/org/jenkinsci/plugins/GithubSecurityRealm.java

I resolved the conflicts and the result is passing the testsuite locally.
I'm now opening this as an intentional duplicate of #36
#36 , and hoping

that the tests will pass on the cloudbees jenkins server as well.

You can view, comment on, or merge this pull request online at:

#41
Commit Summary

  • JENKINS-21331: include teams as groups

File Changes

Patch Links:

—
Reply to this email directly or view it on GitHub
#41.

@samrocketman
Copy link
Copy Markdown
Member

samrocketman commented Jul 11, 2015

I'll compile and manually test this change over the weekend. If it all works out then I'll merge this and close #36.

@jenkinsadmin
Copy link
Copy Markdown
Member

jenkinsadmin commented Jul 11, 2015

Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests

@samrocketman samrocketman merged commit 7fea114 into jenkinsci:master Jul 11, 2015
samrocketman added a commit that referenced this pull request Jul 11, 2015
@samrocketman
Merge PR #41 JENKINS-28575 include GitHub teams as
bdb98e6 
groups

closes #36
@sirosen sirosen deleted the rebuilt-jcarsique-pr branch July 12, 2015 16:03
@samrocketman samrocketman mentioned this pull request Oct 24, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sirosen @jcarsique @samrocketman @jenkinsadmin