Skip to content

Fix JENKINS-34834#54

Merged
samrocketman merged 4 commits into
jenkinsci:masterfrom
apemberton:fix-JENKINS-34834
May 26, 2016
Merged

Fix JENKINS-34834#54
samrocketman merged 4 commits into
jenkinsci:masterfrom
apemberton:fix-JENKINS-34834

Conversation

@apemberton
Copy link
Copy Markdown
Contributor

GitHub no longer creates a default 'Owners' group (as of 2.4 or so)
Reference: https://help.github.com/articles/about-improved-organization-permissions/

Thus, a User can belong to an Organization without being in a Team on that Org. So we need to lookup both the User's organizations and teams and merge them when calculating the user's group memberships in Jenkins.

@reviewbybees

@ghost
Copy link
Copy Markdown

ghost commented May 15, 2016

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@samrocketman
Copy link
Copy Markdown
Member

What's the purpose of re-organizing the imports? I had sorted them in alphabetical order. (e.g. from vim :sort).

@samrocketman
Copy link
Copy Markdown
Member

samrocketman commented May 15, 2016

Feel free to rebase because I merged #53.

@michaelneale
Copy link
Copy Markdown
Member

🐝

@samrocketman I bet that re-org of imports is an overzealous IntelliJ ;)

@apemberton
Copy link
Copy Markdown
Contributor Author

Eclipse organize imports, actually

There were some unused imports included, so I suppose my organize imports routine had a different sorting algorithm. Sorry about that!

@samrocketman
Copy link
Copy Markdown
Member

I don't mind, I just didn't know what to make of it. It didn't follow any kind of logic that I could tell.

@apemberton
Copy link
Copy Markdown
Contributor Author

@samrocketman is this mergeable now? Or did I need to do something?

@samrocketman
Copy link
Copy Markdown
Member

Yep, I'll merge it when I can.

@samrocketman samrocketman merged commit cd3d357 into jenkinsci:master May 26, 2016
samrocketman added a commit that referenced this pull request May 26, 2016
@michaelneale
Copy link
Copy Markdown
Member

nice @samrocketman

@apemberton eclipse? I thought we could be friends. Oh well.

@apemberton apemberton deleted the fix-JENKINS-34834 branch May 27, 2016 17:53
@apemberton
Copy link
Copy Markdown
Contributor Author

@michaelneale shaming me on GitHub private repo PRs is one thing, but... https://s-media-cache-ak0.pinimg.com/736x/ec/a5/01/eca501f82483cf063f73045316c8c2a1.jpg

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants