Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge only works when trigger phrase is present #257 #381

Merged
merged 4 commits into from
Jul 19, 2016

Conversation

dulvac
Copy link

@dulvac dulvac commented Jul 11, 2016

Adds a new checkbox parameter to the merger post build action that allows merging without a trigger phrase if configured like that.

@@ -71,4 +72,19 @@ public void deleteOnMerge(boolean deleteOnMerge) {
public void deleteOnMerge() {
deleteOnMerge(true);
}

/**
* Allows merging the PR even if the trigger phrase was not present. Dewfaults to {@code false}
Copy link

Choose a reason for hiding this comment

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

Typo at "Defaults"

@DavidTanner
Copy link
Contributor

Other than the pom.xml changes I think everything looks good.

@dulvac
Copy link
Author

dulvac commented Jul 12, 2016

retest please

@dulvac
Copy link
Author

dulvac commented Jul 12, 2016

test this please

@dulvac
Copy link
Author

dulvac commented Jul 12, 2016

@DavidTanner , your jenkins job seems to time out after 30 minutes. Slow download?

@DavidTanner
Copy link
Contributor

I am not sure what is going on. That job is the main build that the Jenkins team set up, I have no control over it

<connection>scm:git:ssh://github.com/jenkinsci/ghprb-plugin.git</connection>
<developerConnection>scm:git:ssh://[email protected]/jenkinsci/ghprb-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/ghprb-plugin</url>
<connection>scm:git:ssh://github.com/dulvac/ghprb-plugin.git</connection>
Copy link
Contributor

Choose a reason for hiding this comment

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

All changes to pom.xml need to be reverted here.

Copy link
Author

Choose a reason for hiding this comment

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

done

@dulvac
Copy link
Author

dulvac commented Jul 12, 2016

well... seems to work now

@dulvac
Copy link
Author

dulvac commented Jul 13, 2016

@DavidTanner Anything else I can do?

@dulvac
Copy link
Author

dulvac commented Jul 19, 2016

Hi guys, It is possible to merge this into master?

@brettneese
Copy link

+1, our team could really use this

@DavidTanner DavidTanner merged commit 46b9ebf into jenkinsci:master Jul 19, 2016
nosmo pushed a commit to nosmo/ghprb-plugin that referenced this pull request Dec 12, 2018
 Merge only works when trigger phrase is present jenkinsci#257
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