Skip to content

The Unified and Autonomous Development Platform

chore: Add renovate automerge support

Robin Shen8e0125ea7a66
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 7ff9d8b8ed..aee8677567 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -56,6 +56,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void checkReviews(PullRequest request, boolean sourceUpdated);
+ void checkAutoMerge(PullRequest request);
+
List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index 2e54937b0b..1d878169f7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -67,6 +67,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
change.setData(new PullRequestMergeStrategyChangeData(request.getMergeStrategy(), mergeStrategy));
change.setUser(SecurityUtils.getUser());
create(change, null);
+ request.getAutoMerge().setEnabled(false);
request.setMergeStrategy(mergeStrategy);
}
@@ -128,6 +129,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
String prevTargetBranch = request.getTargetBranch();
if (!targetBranch.equals(prevTargetBranch)) {
request.setTargetBranch(targetBranch);
+ request.getAutoMerge().setEnabled(false);
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index f16ac53f52..fbecf52860 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -298,7 +298,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
ObjectId.fromString(request.getMergePreview().getMergeCommitHash()), null);
}
- closeAsMerged(user, request, false);
+ closeAsMerged(request, false);
gitService.updateRef(project, request.getTargetRef(), mergeCommitId,
ObjectId.fromString(mergePreview.getTargetHeadCommitHash()));
@@ -353,7 +353,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
listenerRegistry.post(new PullRequestOpened(request));
}
- private void closeAsMerged(User user, PullRequest request, boolean dueToMerged) {
+ private void closeAsMerged(PullRequest request, boolean dueToMerged) {
request.setStatus(MERGED);
request.setCloseDate(new Date());
@@ -369,7 +369,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
reason = null;
PullRequestChange change = new PullRequestChange();
- change.setUser(user);
+ change.setUser(SecurityUtils.getUser());
change.setDate(date);
change.setData(new PullRequestMergeData(reason));
change.setRequest(request);
@@ -413,16 +413,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
var gitDir = projectManager.getRepository(projectId).getDirectory();
projectManager.directoryModified(projectId, gitDir);
}
-
- @Listen
- public void on(PullRequestOpened event) {
- gitDirModified(event.getProject().getId());
- }
-
- @Listen
- public void on(PullRequestUpdated event) {
- gitDirModified(event.getProject().getId());
- }
@Listen
public void on(PullRequestDeleted event) {
@@ -433,19 +423,21 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
public void on(PullRequestsDeleted event) {
gitDirModified(event.getProject().getId());
}
-
- @Sessional
- @Listen
- public void on(PullRequestMergePreviewUpdated event) {
- gitDirModified(event.getProject().getId());
- }
-
- @Sessional
- @Listen
- public void on(PullRequestBuildCommitUpdated event) {
- gitDirModified(event.getProject().getId());
+
+ @Transactional
+ @Override
+ public void checkAutoMerge(PullRequest request) {
+ if (request.isOpen()) {
+ var autoMerge = request.getAutoMerge();
+ if (autoMerge.isEnabled() && request.checkMerge() == null) {
+ if (autoMerge.getUser() != null)
+ merge(autoMerge.getUser(), request, null);
+ else
+ throw new ExplicitException("Auto merge user not specified");
+ }
+ }
}
-
+
private void check(PullRequest request, boolean sourceUpdated, boolean updateBuildCommit) {
try {
request.setCheckError(null);
@@ -459,7 +451,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
} else {
updateManager.checkUpdate(request);
if (request.isMergedIntoTarget()) {
- closeAsMerged(SecurityUtils.getUser(), request, true);
+ closeAsMerged(request, true);
} else {
checkReviews(request, sourceUpdated);
@@ -499,13 +491,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
updateBuildCommitRef(request);
listenerRegistry.post(new PullRequestBuildCommitUpdated(request));
}
- var autoMerge = request.getAutoMerge();
- if (autoMerge.isEnabled() && request.checkMerge() == null) {
- if (autoMerge.getUser() != null)
- merge(autoMerge.getUser(), request, null);
- else
- throw new ExplicitException("Auto merge user not specified");
- }
+ checkAutoMerge(request);
}
}
}
@@ -600,48 +586,38 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));
return query(criteria);
}
-
- @Transactional
- @Listen
- public void on(PullRequestChanged event) {
- PullRequestChangeData data = event.getChange().getData();
- if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData) {
- check(event.getRequest(), false, false);
- } else if (data instanceof PullRequestMergeStrategyChangeData
- || data instanceof PullRequestTargetBranchChangeData) {
- check(event.getRequest(), false, true);
- }
- }
@Transactional
@Listen
public void on(PullRequestEvent event) {
- if (event instanceof PullRequestUpdated) {
- Collection<User> committers = ((PullRequestUpdated) event).getCommitters();
- if (committers.size() == 1) {
- LastActivity lastActivity = new LastActivity();
- lastActivity.setUser(committers.iterator().next());
- lastActivity.setDescription("added commits");
- lastActivity.setDate(event.getDate());
- event.getRequest().setLastActivity(lastActivity);
- } else {
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("Commits added");
- lastActivity.setDate(event.getDate());
- event.getRequest().setLastActivity(lastActivity);
+ if (event instanceof PullRequestOpened
+ || event instanceof PullRequestBuildCommitUpdated) {
+ gitDirModified(event.getProject().getId());
+ } else if (event instanceof PullRequestMergePreviewUpdated) {
+ gitDirModified(event.getProject().getId());
+ checkAutoMerge(event.getRequest());
+ } if (event instanceof PullRequestChanged) {
+ PullRequestChangeData data = ((PullRequestChanged) event).getChange().getData();
+ if (data instanceof PullRequestApproveData) {
+ checkAutoMerge(event.getRequest());
+ } else if (data instanceof PullRequestMergeStrategyChangeData
+ || data instanceof PullRequestTargetBranchChangeData) {
+ check(event.getRequest(), false, true);
}
- event.getRequest().getAutoMerge().setEnabled(false);
- } else if (!event.isMinor()) {
+ } else if (event instanceof PullRequestBuildEvent) {
+ var build = ((PullRequestBuildEvent) event).getBuild();
+ if (build.isSuccessful())
+ checkAutoMerge(event.getRequest());
+ } else if (event instanceof PullRequestReviewerRemoved) {
+ checkAutoMerge(event.getRequest());
+ } else if (event instanceof PullRequestUpdated) {
+ gitDirModified(event.getProject().getId());
+ }
+
+ if (!(event instanceof PullRequestOpened) && !event.isMinor()) {
event.getRequest().setLastActivity(event.getLastUpdate());
- if (event instanceof PullRequestCodeCommentEvent) {
+ if (event instanceof PullRequestCodeCommentEvent)
event.getRequest().setCodeCommentsUpdateDate(event.getDate());
- } else if (event instanceof PullRequestChanged) {
- var data = ((PullRequestChanged) event).getChange().getData();
- if (data instanceof PullRequestMergeStrategyChangeData
- || data instanceof PullRequestTargetBranchChangeData) {
- event.getRequest().getAutoMerge().setEnabled(false);
- }
- }
}
}
@@ -649,15 +625,9 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Sessional
public void on(BuildEvent event) {
Build build = event.getBuild();
- if (build.getRequest() != null) {
- if (build.getRequest().isDiscarded()) {
- if (build.getRequest().getLatestUpdate().getTargetHeadCommitHash().equals(build.getCommitHash()))
- listenerRegistry.post(new PullRequestBuildEvent(build));
- } else {
- MergePreview mergePreview = build.getRequest().checkMergePreview();
- if (mergePreview != null && build.getCommitHash().equals(mergePreview.getMergeCommitHash()))
- listenerRegistry.post(new PullRequestBuildEvent(build));
- }
+ if (build.getRequest() != null && build.getRequest().isOpen()) {
+ if (build.getCommitHash().equals(build.getRequest().getBuildCommitHash()))
+ listenerRegistry.post(new PullRequestBuildEvent(build));
}
}
@@ -716,27 +686,29 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Transactional
@Override
public void checkReviews(PullRequest request, boolean sourceUpdated) {
- BranchProtection branchProtection = request.getTargetProject()
- .getBranchProtection(request.getTargetBranch(), request.getSubmitter());
- Collection<String> changedFiles;
- if (sourceUpdated) {
- changedFiles = request.getLatestUpdate().getChangedFiles();
- } else {
- changedFiles = new HashSet<>();
- for (PullRequestUpdate update: request.getUpdates())
- changedFiles.addAll(update.getChangedFiles());
- }
- checkReviews(branchProtection.getParsedReviewRequirement(),
- request, changedFiles, sourceUpdated);
-
- ReviewRequirement checkedRequirement = ReviewRequirement.parse(null);
-
- for (String file: changedFiles) {
- FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {
- checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());
- checkReviews(fileProtection.getParsedReviewRequirement(),
- request, Sets.newHashSet(file), sourceUpdated);
+ if (request.isOpen()) {
+ BranchProtection branchProtection = request.getTargetProject()
+ .getBranchProtection(request.getTargetBranch(), request.getSubmitter());
+ Collection<String> changedFiles;
+ if (sourceUpdated) {
+ changedFiles = request.getLatestUpdate().getChangedFiles();
+ } else {
+ changedFiles = new HashSet<>();
+ for (PullRequestUpdate update : request.getUpdates())
+ changedFiles.addAll(update.getChangedFiles());
+ }
+ checkReviews(branchProtection.getParsedReviewRequirement(),
+ request, changedFiles, sourceUpdated);
+
+ ReviewRequirement checkedRequirement = ReviewRequirement.parse(null);
+
+ for (String file : changedFiles) {
+ FileProtection fileProtection = branchProtection.getFileProtection(file);
+ if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {
+ checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());
+ checkReviews(fileProtection.getParsedReviewRequirement(),
+ request, Sets.newHashSet(file), sourceUpdated);
+ }
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index 311f26c07e..bf098acdaa 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -67,6 +67,7 @@ public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullReque
@Override
public void checkUpdate(PullRequest request) {
if (!request.getLatestUpdate().getHeadCommitHash().equals(request.getSource().getObjectName())) {
+ request.getAutoMerge().setEnabled(false);
ObjectId mergeBase = gitService.getMergeBase(
request.getTargetProject(), request.getTarget().getObjectId(),
request.getSourceProject(), request.getSource().getObjectId());
@@ -80,7 +81,6 @@ public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullReque
gitService.updateRef(request.getTargetProject(), request.getHeadRef(),
ObjectId.fromString(request.getLatestUpdate().getHeadCommitHash()), null);
-
listenerRegistry.post(new PullRequestUpdated(update));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
index aa92a0450b..09c86c5631 100644
--- a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
+++ b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
@@ -11,6 +11,7 @@ import io.onedev.server.event.project.ActiveServerChanged;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.security.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,6 +111,7 @@ public class DefaultListenerRegistry implements ListenerRegistry, Serializable {
ProjectEvent projectEvent = (ProjectEvent) event;
Long projectId = projectEvent.getProject().getId();
transactionManager.runAfterCommit(() -> projectManager.submitToActiveServer(projectId, () -> {
+ SecurityUtils.bindAsSystem();
try {
String lockName = projectEvent.getLockName();
if (lockName != null) {
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index e30e037a9a..84ce765eb4 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -1001,20 +1001,13 @@ public class PullRequest extends ProjectBelonging
public BuildRequirement getBuildRequirement() {
if (buildRequirement == null) {
- MergePreview preview = checkMergePreview();
- if (preview != null && preview.getMergeCommitHash() != null) {
- BranchProtection protection = getTargetProject().getBranchProtection(getTargetBranch(), getSubmitter());
- ObjectId targetCommitId = getTarget().getObjectId(false);
- ObjectId mergeCommitId = getTargetProject().getObjectId(preview.getMergeCommitHash(), false);
- if (targetCommitId != null && mergeCommitId != null) {
- buildRequirement = protection.getBuildRequirement(getTargetProject(), targetCommitId,
- mergeCommitId, new HashMap<>());
- } else {
- buildRequirement = new BuildRequirement(new HashSet<>(), false);
- }
- } else {
- buildRequirement = new BuildRequirement(new HashSet<>(), false);
- }
+ BranchProtection protection = getTargetProject().getBranchProtection(getTargetBranch(), getSubmitter());
+ ObjectId requestHeadId = ObjectId.fromString(getLatestUpdate().getHeadCommitHash());
+ var mergeBaseId = getGitService().getMergeBase(
+ getProject(), ObjectId.fromString(getLatestUpdate().getTargetHeadCommitHash()),
+ getProject(), requestHeadId);
+ buildRequirement = protection.getBuildRequirement(getTargetProject(), mergeBaseId,
+ requestHeadId, new HashMap<>());
}
return buildRequirement;
}
@@ -1040,7 +1033,6 @@ public class PullRequest extends ProjectBelonging
var commitMessageError = checkCommitMessages();
if (commitMessageError != null)
return commitMessageError.toString();
-
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
index 065810aae1..0aa4207db2 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
@@ -110,24 +110,6 @@ public class PullRequestUpdate extends AbstractEntity {
return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);
}
- /**
- * Base commit represents head commit of last update, or base commit of the request
- * for the first update. Base commit is used to calculate commits belonging to
- * current update.
- *
- * @return
- * base commit of this update
- */
- public RevCommit getBaseCommit() {
- PullRequest request = getRequest();
-
- int index = request.getSortedUpdates().indexOf(this);
- if (index > 0)
- return request.getSortedUpdates().get(index-1).getHeadCommit();
- else
- return request.getBaseCommit();
- }
-
public List<RevCommit> getCommits() {
if (commits == null) {
Collection<ObjectId> uninterestingCommitIds = Lists.newArrayList(
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
index b537b510d5..fe411d2b36 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java
@@ -27,7 +27,7 @@ public class AutoMerge implements Serializable {
@OptimisticLock(excluded=true)
private User user;
- @Column(name= COLUMN_COMMIT_MESSAGE)
+ @Column(length=1048576, name=COLUMN_COMMIT_MESSAGE)
@OptimisticLock(excluded=true)
private String commitMessage;
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index de8ffce934..0ffe005968 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -233,7 +233,11 @@ public class PullRequestResource {
request.setSubmitter(user);
request.setBaseCommitHash(baseCommitId.name());
request.setDescription(data.getDescription());
- request.setMergeStrategy(data.getMergeStrategy());
+
+ if (data.getMergeStrategy() != null)
+ request.setMergeStrategy(data.getMergeStrategy());
+ else
+ request.setMergeStrategy(request.getProject().findDefaultPullRequestMergeStrategy());
if (request.getBaseCommitHash().equals(source.getObjectName()))
throw new InvalidParamException("Change already merged");
@@ -317,33 +321,45 @@ public class PullRequestResource {
@Path("/{requestId}/auto-merge")
@POST
public Response setAutoMerge(@PathParam("requestId") Long requestId, @NotNull AutoMergeData data) {
+ var user = SecurityUtils.getUser();
PullRequest request = pullRequestManager.load(requestId);
- if (request.getAutoMerge().isEnabled()) {
- var authUser = SecurityUtils.getAuthUser();
- if (SecurityUtils.canManagePullRequests(request.getProject())
- || authUser != null && authUser.equals(request.getAutoMerge().getUser())) {
- var autoMerge = new AutoMerge();
- autoMerge.setEnabled(data.isEnabled());
- autoMerge.setUser(SecurityUtils.getUser());
- autoMerge.setCommitMessage(data.getCommitMessage());
- pullRequestChangeManager.changeAutoMerge(request, autoMerge);
+ if (request.isOpen()) {
+ if (request.getAutoMerge().isEnabled()) {
+ if (SecurityUtils.canManagePullRequests(request.getProject())
+ || user != null && user.equals(request.getAutoMerge().getUser())) {
+ var autoMerge = new AutoMerge();
+ autoMerge.setEnabled(data.isEnabled());
+ autoMerge.setUser(user);
+ if (data.getCommitMessage() != null)
+ autoMerge.setCommitMessage(data.getCommitMessage());
+ pullRequestChangeManager.changeAutoMerge(request, autoMerge);
+ } else {
+ throw new UnauthorizedException();
+ }
+ } else if (SecurityUtils.canWriteCode(request.getProject())) {
+ if (data.isEnabled()) {
+ if (request.checkMerge() == null) {
+ pullRequestManager.merge(user, request, data.getCommitMessage());
+ } else {
+ var autoMerge = new AutoMerge();
+ autoMerge.setEnabled(true);
+ autoMerge.setUser(user);
+ if (data.getCommitMessage() != null)
+ autoMerge.setCommitMessage(data.getCommitMessage());
+ else
+ autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());
+ pullRequestChangeManager.changeAutoMerge(request, autoMerge);
+ }
+ } else {
+ throw new UnsupportedOperationException("Auto merge already disabled");
+ }
} else {
throw new UnauthorizedException();
}
- } else if (SecurityUtils.canWriteCode(request.getProject())) {
- if (data.isEnabled()) {
- var autoMerge = new AutoMerge();
- autoMerge.setEnabled(true);
- autoMerge.setUser(SecurityUtils.getUser());
- autoMerge.setCommitMessage(data.getCommitMessage());
- pullRequestChangeManager.changeAutoMerge(request, autoMerge);
- } else {
- throw new UnsupportedOperationException();
- }
+ return Response.ok().build();
} else {
- throw new UnauthorizedException();
+ throw new UnsupportedOperationException("Pull request is closed");
}
- return Response.ok().build();
}
@Api(order=1600)
@@ -516,7 +532,6 @@ public class PullRequestResource {
this.description = description;
}
- @NotNull
public MergeStrategy getMergeStrategy() {
return mergeStrategy;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index f886df6c84..970e8bd19b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
@@ -63,7 +63,7 @@ public abstract class ReviewListPanel extends Panel {
super.onConfigure();
PullRequest request = getPullRequest();
- setVisible(!reviewsModel.getObject().isEmpty() || SecurityUtils.canModifyPullRequest(request) && !request.isMerged());
+ setVisible(!reviewsModel.getObject().isEmpty() || SecurityUtils.canModifyPullRequest(request) && request.isOpen());
}
@Override
@@ -123,7 +123,7 @@ public abstract class ReviewListPanel extends Panel {
PullRequestReview review = item.getModelObject();
User currentUser = SecurityUtils.getAuthUser();
setVisible(!request.isNew()
- && !request.isMerged()
+ && request.isOpen()
&& review.getStatus() != PullRequestReview.Status.PENDING
&& (SecurityUtils.canModifyPullRequest(getPullRequest()) || review.getUser().equals(currentUser)));
}
@@ -177,8 +177,7 @@ public abstract class ReviewListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
-
- setVisible(SecurityUtils.canModifyPullRequest(getPullRequest()) && !request.isMerged());
+ setVisible(SecurityUtils.canModifyPullRequest(getPullRequest()) && request.isOpen());
}
});
@@ -191,7 +190,7 @@ public abstract class ReviewListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index f869456bb5..2bf21a6c7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -232,10 +232,10 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="autoMergeEnabledFrag">
- Pull request will be merged automatically<wicket:enclosure> with a preset <a wicket:id="commitMessage">commit message</a></wicket:enclosure> once all reviewers have approved and all required jobs have passed.
- This option will be disabled upon adding new commits, changing merge strategy, or switching target branch.
+ Pull request will be merged automatically<wicket:enclosure> with a preset <a wicket:id="commitMessage">commit message</a></wicket:enclosure> when ready.
+ This option will be disabled upon adding new commits, changing merge strategy, or switching target branch
</wicket:fragment>
<wicket:fragment wicket:id="autoMergeDisabledFrag">
- Enable this option to automatically merge the pull request once all reviewers have approved and all required jobs have passed.
+ Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index e77a664424..f09448a636 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -913,7 +913,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
});
@@ -976,7 +976,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().isMerged()
+ setVisible(getPullRequest().isOpen()
&& SecurityUtils.getUser() != null
&& !getPullRequest().getAssignees().contains(SecurityUtils.getUser())
&& SecurityUtils.canWriteCode(getProject())
@@ -996,7 +996,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
});
@@ -1198,8 +1198,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
-
- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
};
@@ -1227,7 +1226,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected void onConfigure() {
super.onConfigure();
- setVisible(getPullRequest().isMerged() || !SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(!getPullRequest().isOpen() || !SecurityUtils.canModifyPullRequest(getPullRequest()));
}
});
@@ -1245,7 +1244,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModifyPullRequest(getPullRequest()));
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));
}
});
diff --git a/server-ee b/server-ee
index eb0ed6c465..feff9f1b72 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit eb0ed6c4658108a23421a65cd748807a171447ab
+Subproject commit feff9f1b72eaceed5080e6d1f7afe17fb0beaf0d