Skip to content

Don't overwrite user's email, if it already exists#4

Closed
orenhe wants to merge 2 commits into
jenkinsci:masterfrom
orenhe:master
Closed

Don't overwrite user's email, if it already exists#4
orenhe wants to merge 2 commits into
jenkinsci:masterfrom
orenhe:master

Conversation

@orenhe
Copy link
Copy Markdown
Contributor

@orenhe orenhe commented Mar 4, 2013

If the Jenkins user's email is already filled in, in most cases it's the email the user wants, and overwriting it in each login is unexpected and undesired.

@buildhive
Copy link
Copy Markdown

Jenkins » github-oauth-plugin #16 SUCCESS
This pull request looks good
(what's this?)

@buildhive
Copy link
Copy Markdown

Jenkins » github-oauth-plugin #17 SUCCESS
This pull request looks good
(what's this?)

@buildhive
Copy link
Copy Markdown

Jenkins » github-oauth-plugin #18 SUCCESS
This pull request looks good
(what's this?)

@bbbco
Copy link
Copy Markdown

bbbco commented Apr 26, 2013

Can we please get this merged? Our users are complaining about this!

@ghost
Copy link
Copy Markdown

ghost commented Apr 29, 2013

@bbbco, good news! You don't have to wait for this to be merged and for a release to be made including it. You can fork the plugin, merge in this change, and deploy your custom build. Your users could be made happy TODAY!

@ghost ghost mentioned this pull request Apr 29, 2013
@bbbco
Copy link
Copy Markdown

bbbco commented Apr 29, 2013

Understood, however, we are not a Java based shop. No one has used Maven here, and we don't have resources available to learn how to do so.

In an ideal world, this would be as simple as you make it sound, but unfortunately, its not :(
Thanks for the thoughts though!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this if statement is the beef. Please avoid changing so much indenting. Using Util.fixEmptyAndTrim here would make the check much more robust.

@skottler

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnou It was a deliberate change to fix an evil some-spaces-some-tabs case.
I also split my change into two commits (https://github.com/jenkinsci/github-oauth-plugin/pull/4/commits) - one for indentation only and one for the concrete fix.

Maybe I should have used two separate pull requests, but I really think the indentation change is negligible and this pull request should be accepted.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnou Possibly I wasn't clear enough in my last comment - you easily see & review two different commits, in this pull request, by viewing changes of each commit separately:
1st commit (c5925f5): indentation fix
2nd commit (88f6ee7): Fixing the user's email issue

@kohsuke
Copy link
Copy Markdown
Member

kohsuke commented Jul 11, 2013

As per the comment from @johnou , I cherry picked 88f6ee7 and left the other indentation only changes.

Sorry it took us so long to come to this pull request!

@kohsuke kohsuke closed this Jul 11, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants