The Unified and Autonomous Development Platform
Improve review system. Introduce pull request assignee
Robin Shenbbf507265a5a
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 222ec5547c..a376ca2123 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -110,7 +110,8 @@ import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestAssignmentManager;+import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -144,7 +145,8 @@ import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;import io.onedev.server.entitymanager.impl.DefaultMembershipManager;import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;import io.onedev.server.entitymanager.impl.DefaultProjectManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestBuildManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestVerificationManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;@@ -224,6 +226,7 @@ import io.onedev.server.security.OneFilterChainResolver;import io.onedev.server.security.OnePasswordService;import io.onedev.server.security.OneRememberMeManager;import io.onedev.server.security.OneWebSecurityManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.ssh.DefaultKeyPairProvider;import io.onedev.server.ssh.DefaultSshAuthenticator;import io.onedev.server.ssh.SshAuthenticator;@@ -233,7 +236,6 @@ import io.onedev.server.storage.AttachmentStorageManager;import io.onedev.server.storage.DefaultAttachmentStorageManager;import io.onedev.server.storage.DefaultStorageManager;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.jackson.ObjectMapperConfigurator;import io.onedev.server.util.jackson.ObjectMapperProvider;import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;@@ -356,7 +358,7 @@ public class CoreModule extends AbstractPluginModule {bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);bind(JobManager.class).to(DefaultJobManager.class);bind(LogManager.class).to(DefaultLogManager.class);- bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);+ bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);@@ -396,9 +398,11 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentQuerySettingManager.class).to(DefaultCodeCommentQuerySettingManager.class);bind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);- bind(WebHookManager.class);+ bind(PullRequestAssignmentManager.class).to(DefaultPullRequestAssignmentManager.class);bind(SshKeyManager.class).to(DefaultSshKeyManager.class);+ bind(WebHookManager.class);+contribute(ImplementationProvider.class, new ImplementationProvider() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 1e0f39a6f0..e6b7029a92 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -42,7 +42,7 @@ import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ServerConfig;import io.onedev.server.util.Version;import io.onedev.server.util.init.InitStage;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 5e15650f29..37e5610f9c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -90,13 +90,13 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.CommitAware;import io.onedev.server.util.JobLogger;import io.onedev.server.util.MatrixRunner;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.javaindex 55e75ab087..f1ac0a6838 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java@@ -67,7 +67,7 @@ public enum JobVariable {@Overridepublic String getValue(Build build) {- return build.getPullRequestBuilds()+ return build.getVerifications().stream().map(it->it.getRequest().getId().toString()).collect(Collectors.joining(" "));diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.javaindex 95984a75e6..4c93cc35df 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java@@ -15,9 +15,9 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.EditContext;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.interpolative.Segment;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 9f8f8ad304..851f34532e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -22,7 +22,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldsupply.FieldSupply;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.FieldNamesProvider;import io.onedev.server.web.editable.annotation.Interpolative;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.javaindex 264f3600b3..e1e1643446 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java@@ -9,7 +9,7 @@ public class AssociatedWithPullRequestsCriteria extends Criteria<Build> {@Overridepublic boolean matches(Build build) {- return !build.getPullRequestBuilds().isEmpty();+ return !build.getVerifications().isEmpty();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.javaindex 7516cdb714..c90c1be132 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java@@ -9,7 +9,7 @@ public class RequiredByPullRequestsCriteria extends Criteria<Build> {@Overridepublic boolean matches(Build build) {- return build.getPullRequestBuilds().stream().anyMatch(it->it.isRequired());+ return build.getVerifications().stream().anyMatch(it->it.isRequired());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.javanew file mode 100644index 0000000000..5f7fed1689--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestAssignmentManager.java@@ -0,0 +1,11 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.PullRequestAssignment;+import io.onedev.server.persistence.dao.EntityManager;++public interface PullRequestAssignmentManager extends EntityManager<PullRequestAssignment> {++ void addAssignee(PullRequestAssignment assignment);++ void removeAssignee(PullRequestAssignment assignment);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.javadeleted file mode 100644index ac9084f6a6..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.entitymanager;--import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.persistence.dao.EntityManager;--public interface PullRequestBuildManager extends EntityManager<PullRequestBuild> {-- void savePullRequestBuilds(PullRequest request);--}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.javaindex 3ccf69e143..e7da99860e 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@@ -48,6 +48,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void check(PullRequest request);+ void merge(PullRequest request, @Nullable String commitMessage);+/*** Preview merge of this pull request.*@@ -68,7 +70,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {int countOpen(Project targetProject);- void checkQuality(PullRequest request);+ void checkQuality(PullRequest request, List<User> unpreferableReviewers);List<PullRequest> query(@Nullable Project targetProject,EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.javaindex 6e84f9d363..63428500f5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java@@ -1,5 +1,7 @@package io.onedev.server.entitymanager;+import java.util.List;+import javax.annotation.Nullable;import io.onedev.server.model.PullRequest;@@ -14,9 +16,9 @@ public interface PullRequestReviewManager extends EntityManager<PullRequestRevie@NullablePullRequestReview find(PullRequest request, User user, String commit);- boolean excludeReviewer(PullRequestReview review);-void addReviewer(PullRequestReview review);+ boolean removeReviewer(PullRequestReview review, List<User> unpreferableReviewers);+void saveReviews(PullRequest request);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.javanew file mode 100644index 0000000000..f286b6d4d0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java@@ -0,0 +1,11 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.persistence.dao.EntityManager;++public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {++ void saveVerifications(PullRequest request);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 08b0b42376..c241f8f8a2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -76,9 +76,9 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.match.StringMatcher;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex e455c6cd8b..3d398e5206 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -58,7 +58,7 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex da74284ddf..505ac0593c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -73,10 +73,10 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectScopedCommit;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.match.StringMatcher;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex fdd02cc7d0..fe69b68259 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -73,10 +73,10 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.MilestoneAndState;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 3d55cb7835..bfe456113d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -84,8 +84,8 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.javanew file mode 100644index 0000000000..68b160104c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java@@ -0,0 +1,65 @@+package io.onedev.server.entitymanager.impl;++import java.util.Date;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.PullRequestAssignmentManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestAssignment;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeRemoveData;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.security.SecurityUtils;++@Singleton+public class DefaultPullRequestAssignmentManager extends AbstractEntityManager<PullRequestAssignment>+ implements PullRequestAssignmentManager {++ private final PullRequestChangeManager pullRequestChangeManager;++ @Inject+ public DefaultPullRequestAssignmentManager(Dao dao,+ PullRequestChangeManager pullRequestChangeManager) {+ super(dao);+ this.pullRequestChangeManager = pullRequestChangeManager;+ }++ @Transactional+ @Override+ public void addAssignee(PullRequestAssignment assignment) {+ save(assignment);++ PullRequest request = assignment.getRequest();+ request.getAssignments().add(assignment);++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setRequest(request);+ change.setData(new PullRequestAssigneeAddData(assignment.getUser().getDisplayName()));+ change.setUser(SecurityUtils.getUser());+ pullRequestChangeManager.save(change);+ }++ @Transactional+ @Override+ public void removeAssignee(PullRequestAssignment assignment) {+ delete(assignment);++ PullRequest request = assignment.getRequest();+ request.getAssignments().remove(assignment);++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setRequest(request);+ change.setData(new PullRequestAssigneeRemoveData(assignment.getUser().getDisplayName()));+ change.setUser(SecurityUtils.getUser());+ pullRequestChangeManager.save(change);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.javadeleted file mode 100644index 9a2abe59ea..0000000000--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.entitymanager.impl;--import java.util.Collection;-import java.util.HashSet;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.Query;--import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.server.entitymanager.PullRequestBuildManager;-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultPullRequestBuildManager extends AbstractEntityManager<PullRequestBuild>- implements PullRequestBuildManager {-- private final ListenerRegistry listenerRegistry;-- @Inject- public DefaultPullRequestBuildManager(Dao dao, ListenerRegistry listenerRegistry) {- super(dao);- this.listenerRegistry = listenerRegistry;- }-- @Transactional- @Override- public void savePullRequestBuilds(PullRequest request) {- Collection<Long> ids = new HashSet<>();- for (PullRequestBuild pullRequestBuild: request.getPullRequestBuilds()) {- boolean isNew = pullRequestBuild.isNew();- save(pullRequestBuild);- if (isNew)- listenerRegistry.post(new PullRequestBuildEvent(pullRequestBuild));- ids.add(pullRequestBuild.getId());- }- if (!ids.isEmpty()) {- Query query = getSession().createQuery("delete from PullRequestBuild where request=:request and id not in (:ids)");- query.setParameter("request", request);- query.setParameter("ids", ids);- query.executeUpdate();- } else {- Query query = getSession().createQuery("delete from PullRequestBuild where request=:request");- query.setParameter("request", request);- query.executeUpdate();- }- }--}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.javaindex 7e53ce979d..aee7bd8cc0 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@@ -20,7 +20,7 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChaimport io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Singletonpublic class DefaultPullRequestChangeManager extends AbstractEntityManager<PullRequestChange>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.javaindex 20a1a1411a..e2ab6e9728 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@@ -8,12 +8,12 @@ import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;-import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;@@ -32,8 +32,6 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.authz.Permission;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.CommitBuilder;import org.eclipse.jgit.lib.ObjectId;@@ -42,6 +40,7 @@ import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.revwalk.RevWalkUtils;import org.hibernate.Session;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.MatchMode;@@ -69,32 +68,33 @@ import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.buildspec.job.trigger.PullRequestTrigger;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestAssignmentManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.event.pullrequest.PullRequestUpdated;+import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;@@ -103,6 +103,8 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeRemoveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;@@ -126,13 +128,11 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;@@ -146,8 +146,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);- private static final int MAX_COMMIT_FILES = 100;-private static final int UI_PREVIEW_PRIORITY = 10;private static final int BACKEND_PREVIEW_PRIORITY = 50;@@ -156,20 +154,22 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final ProjectManager projectManager;- private final UserManager userManager;-private final SessionManager sessionManager;private final ListenerRegistry listenerRegistry;private final PullRequestReviewManager pullRequestReviewManager;- private final PullRequestBuildManager pullRequestBuildManager;+ private final PullRequestVerificationManager pullRequestVerificationManager;++ private final CommitInfoManager commitInfoManager;private final BatchWorkManager batchWorkManager;private final PullRequestChangeManager pullRequestChangeManager;+ private final PullRequestAssignmentManager pullRequestAssignmentManager;+private final TransactionManager transactionManager;private final JobManager jobManager;@@ -178,26 +178,27 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Injectpublic DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,- PullRequestReviewManager pullRequestReviewManager, UserManager userManager,- MarkdownManager markdownManager, BatchWorkManager batchWorkManager,- ListenerRegistry listenerRegistry, SessionManager sessionManager,- PullRequestChangeManager pullRequestChangeManager, ExecutorService executorService,- PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager,- JobManager jobManager, ProjectManager projectManager) {+ PullRequestReviewManager pullRequestReviewManager, MarkdownManager markdownManager,+ BatchWorkManager batchWorkManager, ListenerRegistry listenerRegistry,+ SessionManager sessionManager, PullRequestChangeManager pullRequestChangeManager,+ ExecutorService executorService, PullRequestVerificationManager pullRequestVerificationManager,+ TransactionManager transactionManager, JobManager jobManager, ProjectManager projectManager,+ CommitInfoManager commitInfoManager, PullRequestAssignmentManager pullRequestAssignmentManager) {super(dao);this.pullRequestUpdateManager = pullRequestUpdateManager;this.pullRequestReviewManager = pullRequestReviewManager;this.transactionManager = transactionManager;- this.userManager = userManager;this.batchWorkManager = batchWorkManager;this.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.pullRequestChangeManager = pullRequestChangeManager;- this.pullRequestBuildManager = pullRequestBuildManager;+ this.pullRequestVerificationManager = pullRequestVerificationManager;this.executorService = executorService;this.jobManager = jobManager;this.projectManager = projectManager;+ this.commitInfoManager = commitInfoManager;+ this.pullRequestAssignmentManager = pullRequestAssignmentManager;}@Transactional@@ -287,55 +288,90 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestChangeManager.save(change);}- private void merge(PullRequest request) {- MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());- String mergedCommitHash = Preconditions.checkNotNull(preview.getMergeCommitHash());-- ObjectId mergedCommitId = ObjectId.fromString(mergedCommitHash);- RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedCommitId, true);+ @Transactional+ @Override+ public void merge(PullRequest request, String commitMessage) {+ MergePreview mergePreview = Preconditions.checkNotNull(request.getMergePreview());+ ObjectId mergeCommitId = ObjectId.fromString(+ Preconditions.checkNotNull(mergePreview.getMergeCommitHash()));+ PersonIdent user = SecurityUtils.getUser().asPerson();+ Project project = request.getTargetProject();+ MergeStrategy mergeStrategy = mergePreview.getMergeStrategy();- PersonIdent committer = new PersonIdent(OneDev.NAME, "");-- Project targetProject = request.getTargetProject();- MergeStrategy strategy = request.getMergeStrategy();- if ((strategy == CREATE_MERGE_COMMIT || strategy == CREATE_MERGE_COMMIT_IF_NECESSARY || strategy == SQUASH_SOURCE_BRANCH_COMMITS)- && !preview.getMergeCommitHash().equals(preview.getHeadCommitHash())- && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {- try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());- ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {- CommitBuilder newCommit = new CommitBuilder();- newCommit.setAuthor(mergedCommit.getAuthorIdent());- newCommit.setCommitter(committer);- newCommit.setMessage(request.getCommitMessage());- newCommit.setTreeId(mergedCommit.getTree());- newCommit.setParentIds(mergedCommit.getParents());- mergedCommitId = inserter.insert(newCommit);- mergedCommitHash = mergedCommitId.name();+ if (mergeStrategy == CREATE_MERGE_COMMIT+ || mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS+ || mergeStrategy == CREATE_MERGE_COMMIT_IF_NECESSARY+ && !mergeCommitId.name().equals(mergePreview.getHeadCommitHash())) {+ try ( RevWalk revWalk = new RevWalk(project.getRepository());+ ObjectInserter inserter = project.getRepository().newObjectInserter()) {+ RevCommit mergeCommit = revWalk.parseCommit(mergeCommitId);+ CommitBuilder commitBuilder = new CommitBuilder();+ if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)+ commitBuilder.setAuthor(mergeCommit.getAuthorIdent());+ else+ commitBuilder.setAuthor(user);+ commitBuilder.setCommitter(user);+ commitBuilder.setMessage(commitMessage);+ commitBuilder.setTreeId(mergeCommit.getTree());+ commitBuilder.setParentIds(mergeCommit.getParents());+ mergeCommitId = inserter.insert(commitBuilder);+ inserter.flush();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ } else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {+ try ( RevWalk revWalk = new RevWalk(project.getRepository());+ ObjectInserter inserter = project.getRepository().newObjectInserter()) {+ RevCommit mergeCommit = revWalk.parseCommit(mergeCommitId);+ ObjectId targetHeadCommitId = ObjectId.fromString(mergePreview.getTargetHeadCommitHash());+ RevCommit targetHeadCommit = revWalk.parseCommit(targetHeadCommitId);+ List<RevCommit> commits = RevWalkUtils.find(revWalk, mergeCommit, targetHeadCommit);+ Collections.reverse(commits);+ mergeCommit = targetHeadCommit;+ for (RevCommit commit: commits) {+ PersonIdent committer = commit.getCommitterIdent();+ if (committer.getName().equals(OneDev.NAME) && committer.getEmailAddress().length() == 0+ || !commit.getParent(0).equals(mergeCommit)) {+ CommitBuilder commitBuilder = new CommitBuilder();+ commitBuilder.setAuthor(commit.getAuthorIdent());+ commitBuilder.setCommitter(user);+ commitBuilder.setParentId(mergeCommit.copy());+ commitBuilder.setMessage(commit.getFullMessage());+ commitBuilder.setTreeId(commit.getTree().getId());+ mergeCommit = revWalk.parseCommit(inserter.insert(commitBuilder));+ } else {+ mergeCommit = commit;+ }+ }+ mergeCommitId = mergeCommit.copy();inserter.flush();} catch (Exception e) {throw ExceptionUtils.unchecked(e);}- preview = new MergePreview(preview.getTargetHeadCommitHash(), preview.getHeadCommitHash(),- preview.getMergeStrategy(), mergedCommitHash);- request.setLastMergePreview(preview);+ }++ if (!mergeCommitId.name().equals(mergePreview.getMergeCommitHash())) {+ mergePreview = new MergePreview(mergePreview.getTargetHeadCommitHash(),+ mergePreview.getHeadCommitHash(), mergeStrategy, mergeCommitId.name());+ request.setLastMergePreview(mergePreview);request.writeMergeRef();}closeAsMerged(request, false);String targetRef = request.getTargetRef();- ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHeadCommitHash());- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);- refUpdate.setRefLogIdent(committer);+ ObjectId targetHeadCommitId = ObjectId.fromString(mergePreview.getTargetHeadCommitHash());+ RefUpdate refUpdate = GitUtils.getRefUpdate(project.getRepository(), targetRef);+ refUpdate.setRefLogIdent(user);refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);- refUpdate.setExpectedOldObjectId(targetHeadId);- refUpdate.setNewObjectId(mergedCommitId);+ refUpdate.setExpectedOldObjectId(targetHeadCommitId);+ refUpdate.setNewObjectId(mergeCommitId);GitUtils.updateRef(refUpdate);- request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedCommitId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), mergeCommitId);Long requestId = request.getId();- ObjectId newTargetHeadId = mergedCommitId;+ ObjectId newTargetHeadId = mergeCommitId;transactionManager.runAfterCommit(new Runnable() {@Override@@ -347,7 +383,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestPullRequest request = load(requestId);request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,- targetHeadId, newTargetHeadId));+ targetHeadCommitId, newTargetHeadId));}});@@ -377,7 +413,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestUpdateManager.save(update);pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.savePullRequestBuilds(request);+ pullRequestVerificationManager.saveVerifications(request);++ for (PullRequestAssignment assignment: request.getAssignments())+ pullRequestAssignmentManager.save(assignment);checkAsync(Lists.newArrayList(request));@@ -402,7 +441,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreason = null;PullRequestChange change = new PullRequestChange();- change.setUser(userManager.getSystem());+ change.setUser(SecurityUtils.getUser());change.setDate(date);change.setData(new PullRequestMergeData(reason));change.setRequest(request);@@ -426,24 +465,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (request.isMergedIntoTarget()) {closeAsMerged(request, true);} else {- checkQuality(request);+ checkQuality(request, Lists.newArrayList());/** If the check method runs concurrently, below statements may fail. It will* not do any harm except that the transaction rolls back*/pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.savePullRequestBuilds(request);-- MergePreview preview = request.getMergePreview();-- if (request.isAllReviewsApproved()- && request.isRequiredBuildsSuccessful()- && request.getCheckError() == null- && preview != null- && preview.getMergeCommitHash() != null) {- merge(request);- }+ pullRequestVerificationManager.saveVerifications(request);}}}@@ -464,9 +493,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic MergePreview previewMerge(PullRequest request) {if (!request.isNew()) {- MergePreview lastPreview = request.getLastMergePreview();+ MergePreview lastMergePreview = request.getLastMergePreview();if (request.isOpen() && !request.isMergedIntoTarget()) {- if (lastPreview == null || !lastPreview.isUpToDate(request)) {+ if (lastMergePreview == null || !lastMergePreview.isUpToDate(request)) {int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;Long requestId = request.getId();transactionManager.runAfterCommit(new Runnable() {@@ -479,11 +508,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest});return null;} else {- lastPreview.syncRef(request);- return lastPreview;+ lastMergePreview.syncRef(request);+ return lastMergePreview;}} else {- return lastPreview;+ return lastMergePreview;}} else {return null;@@ -509,7 +538,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);logger.debug("Calculating merge preview of pull request #{} in project '{}'...",request.getNumber(), targetProject.getName());- ObjectId merged = mergePreview.getMergeStrategy().merge(request);+ ObjectId merged = mergePreview.getMergeStrategy().merge(request, "Merge preview of pull request #" + request.getNumber());if (merged != null)mergePreview.setMergeCommitHash(merged.name());mergePreview.syncRef(request);@@ -634,7 +663,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic void on(PullRequestChangeEvent event) {PullRequestChangeData data = event.getChange().getData();if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData- || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData|| data instanceof PullRequestMergeStrategyChangeData) {checkAsync(Lists.newArrayList(event.getRequest()));}@@ -663,6 +691,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestPullRequestChangeData changeData = ((PullRequestChangeEvent)event).getChange().getData();if (changeData instanceof PullRequestReviewerAddData|| changeData instanceof PullRequestReviewerRemoveData+ || changeData instanceof PullRequestAssigneeAddData+ || changeData instanceof PullRequestAssigneeRemoveData|| changeData instanceof PullRequestSourceBranchDeleteData|| changeData instanceof PullRequestSourceBranchRestoreData|| changeData instanceof PullRequestReferencedFromCodeCommentData@@ -673,7 +703,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}if (!(event instanceof PullRequestOpened|| event instanceof PullRequestMergePreviewCalculated- || event instanceof PullRequestBuildEvent+ || event instanceof PullRequestVerificationEvent|| minorChange)) {event.getRequest().setLastUpdate(event.getLastUpdate());}@@ -690,9 +720,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactionalpublic void on(BuildEvent event) {Build build = event.getBuild();- for (PullRequestBuild pullRequestBuild: build.getPullRequestBuilds())- listenerRegistry.post(new PullRequestBuildEvent(pullRequestBuild));- checkAsync(build.getPullRequestBuilds()+ for (PullRequestVerification verification: build.getVerifications())+ listenerRegistry.post(new PullRequestVerificationEvent(verification));+ checkAsync(build.getVerifications().stream().map(it->it.getRequest()).collect(Collectors.toList()));@@ -749,10 +779,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Override- public void checkQuality(PullRequest request) {+ public void checkQuality(PullRequest request, List<User> unpreferableReviewers) {+ unpreferableReviewers = new ArrayList<>(unpreferableReviewers);+ unpreferableReviewers.remove(request.getSubmitter());+ unpreferableReviewers.add(request.getSubmitter());BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate());+ checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate(), unpreferableReviewers);ReviewRequirement checkedRequirement = ReviewRequirement.parse(null, true);for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {@@ -765,26 +798,17 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestFileProtection fileProtection = branchProtection.getFileProtection(file);if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());- checkReviews(fileProtection.getParsedReviewRequirement(), update);+ checkReviews(fileProtection.getParsedReviewRequirement(), update, unpreferableReviewers);}}}checkBuilds(request);-- Project project = request.getTargetProject();- Permission writeCode = new ProjectPermission(project, new WriteCode());- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {- Collection<User> writers = new ArrayList<>();- for (User facade: SecurityUtils.getAuthorizedUsers(project, new WriteCode()))- writers.add(userManager.load(facade.getId()));- checkReviews(writers, 1, request.getLatestUpdate());- }}private void checkBuilds(PullRequest request) {- Collection<PullRequestBuild> prevPullRequestBuilds = new ArrayList<>(request.getPullRequestBuilds());- request.getPullRequestBuilds().clear();+ Collection<PullRequestVerification> prevVerifications = new ArrayList<>(request.getVerifications());+ request.getVerifications().clear();MergePreview preview = request.getMergePreview();if (preview != null && preview.getMergeCommitHash() != null) {Project project = request.getTargetProject();@@ -810,20 +834,20 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic void run(Map<String, List<String>> paramMap) {Build build = jobManager.submit(request.getTargetProject(),commitId, job.getName(), paramMap, null);- PullRequestBuild pullRequestBuild = null;- for (PullRequestBuild prevPullRequestBuild: prevPullRequestBuilds) {- if (prevPullRequestBuild.getBuild().equals(build)) {- pullRequestBuild = prevPullRequestBuild;+ PullRequestVerification verification = null;+ for (PullRequestVerification prevVerification: prevVerifications) {+ if (prevVerification.getBuild().equals(build)) {+ verification = prevVerification;break;}}- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setRequest(request);- pullRequestBuild.setBuild(build);+ if (verification == null) {+ verification = new PullRequestVerification();+ verification.setRequest(request);+ verification.setBuild(build);}- pullRequestBuild.setRequired(required);- request.getPullRequestBuilds().add(pullRequestBuild);+ verification.setRequired(required);+ request.getVerifications().add(verification);}}.run();@@ -841,7 +865,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {+ private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update, List<User> unpreferableReviewers) {PullRequest request = update.getRequest();for (User user: reviewRequirement.getUsers()) {@@ -851,8 +875,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreview.setRequest(request);review.setUser(user);request.getReviews().add(review);- } else if (review.getExcludeDate() != null) {- review.setExcludeDate(null);} else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {review.setResult(null);}@@ -861,11 +883,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestfor (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {Group group = entry.getKey();int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update);+ checkReviews(group.getMembers(), requiredCount, update, unpreferableReviewers);}}- private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update) {+ private void checkReviews(Collection<User> users, int requiredCount,+ PullRequestUpdate update, List<User> unpreferableReviewers) {PullRequest request = update.getRequest();if (requiredCount == 0)@@ -875,7 +898,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestSet<User> potentialReviewers = new HashSet<>();for (User user: users) {PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null) {+ if (review != null) {if (review.getResult() == null)requiredCount--;else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())@@ -895,11 +918,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<User> candidateReviewers = new ArrayList<>();for (User user: potentialReviewers) {PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null)+ if (review != null)candidateReviewers.add(user);}- sortByCommitCount(candidateReviewers, update);+ Project project = request.getTargetProject();++ commitInfoManager.sortUsersByContribution(candidateReviewers, project, update.getChangedFiles());for (User user: candidateReviewers) {reviewers.add(user);@@ -912,10 +937,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcandidateReviewers = new ArrayList<>();for (User user: potentialReviewers) {PullRequestReview review = request.getReview(user);- if (review == null)+ if (review == null && !unpreferableReviewers.contains(user))candidateReviewers.add(user);}- sortByCommitCount(candidateReviewers, update);+ commitInfoManager.sortUsersByContribution(candidateReviewers, project, update.getChangedFiles());for (User user: candidateReviewers) {reviewers.add(user);PullRequestReview review = new PullRequestReview();@@ -928,19 +953,17 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}if (reviewers.size() < missingCount) {- List<PullRequestReview> excludedReviews = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() != null)- excludedReviews.add(review);- }- excludedReviews.sort(Comparator.comparing(PullRequestReview::getExcludeDate));-- for (PullRequestReview review: excludedReviews) {- reviewers.add(review.getUser());- review.setExcludeDate(null);- if (reviewers.size() == missingCount)- break;+ for (User reviewer: unpreferableReviewers) {+ PullRequestReview review = request.getReview(reviewer);+ if (review == null && potentialReviewers.contains(reviewer)) {+ reviewers.add(reviewer);+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(reviewer);+ request.getReviews().add(review);+ if (reviewers.size() == missingCount)+ break;+ }}}if (reviewers.size() < missingCount) {@@ -951,56 +974,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- private void sortByCommitCount(List<User> users, PullRequestUpdate update) {- if (users.size() <= 1)- return;-- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- Map<User, Long> commitCounts = new HashMap<>();- for (User user: users)- commitCounts.put(user, 0L);-- int count = 0;- for (String path: update.getChangedFiles()) {- int addedCommitCount = addCommitCounts(commitCounts, commitInfoManager, path, update);- while (addedCommitCount == 0) {- if (path.contains("/")) {- path = StringUtils.substringBeforeLast(path, "/");- addedCommitCount = addCommitCounts(commitCounts, commitInfoManager, path, update);- } else {- addCommitCounts(commitCounts, commitInfoManager, "", update);- break;- }- }- if (++count >= MAX_COMMIT_FILES)- break;- }-- Collections.sort(users, new Comparator<User>() {-- @Override- public int compare(User o1, User o2) {- if (commitCounts.get(o1) < commitCounts.get(o2))- return 1;- else- return -1;- }-- });- }-- private int addCommitCounts(Map<User, Long> commitCounts, CommitInfoManager commitInfoManager,- String path, PullRequestUpdate update) {- int addedCommitCount = 0;- for (Map.Entry<User, Long> entry: commitCounts.entrySet()) {- User user = entry.getKey();- int commitCount = commitInfoManager.getCommitCount(update.getRequest().getTargetProject(), user, path);- entry.setValue(entry.getValue() + commitCount);- addedCommitCount += commitCount;- }- return addedCommitCount;- }-private Predicate[] getPredicates(@Nullable Project targetProject,io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,Root<PullRequest> root, CriteriaBuilder builder) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.javaindex d498977a71..6b9e8141df 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java@@ -2,7 +2,8 @@ package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.Date;-import java.util.HashSet;+import java.util.List;+import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;@@ -13,34 +14,42 @@ import org.hibernate.criterion.Restrictions;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestVerificationManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.ReviewResult;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Singleton-public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {+public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview>+ implements PullRequestReviewManager {private final PullRequestManager pullRequestManager;private final PullRequestChangeManager pullRequestChangeManager;+ private final PullRequestVerificationManager pullRequestVerificationManager;+@Inject- public DefaultPullRequestReviewManager(Dao dao, PullRequestManager pullRequestManager, PullRequestChangeManager pullRequestChangeManager) {+ public DefaultPullRequestReviewManager(Dao dao,+ PullRequestManager pullRequestManager,+ PullRequestChangeManager pullRequestChangeManager,+ PullRequestVerificationManager pullRequestVerificationManager) {super(dao);this.pullRequestManager = pullRequestManager;this.pullRequestChangeManager = pullRequestChangeManager;+ this.pullRequestVerificationManager = pullRequestVerificationManager;}@Transactional@@ -68,25 +77,31 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRreturn find(criteria);}- @Transactional+ @Transactional@Override- public boolean excludeReviewer(PullRequestReview review) {+ public boolean removeReviewer(PullRequestReview review, List<User> unpreferableReviewers) {PullRequest request = review.getRequest();-User reviewer = review.getUser();- pullRequestManager.checkQuality(request);- if (request.getReview(reviewer).getExcludeDate() == null) {- return false;+ request.getReviews().remove(review);++ pullRequestManager.checkQuality(request, unpreferableReviewers);++ if (request.isNew()) {+ return request.getReview(reviewer) == null;} else {- save(review);-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setRequest(request);- change.setUser(SecurityUtils.getUser());- change.setData(new PullRequestReviewerRemoveData(reviewer.getDisplayName()));- pullRequestChangeManager.save(change);- return true;+ saveReviews(request);+ pullRequestVerificationManager.saveVerifications(request);+ if (request.getReview(reviewer) == null) {+ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setRequest(request);+ change.setUser(SecurityUtils.getUser());+ change.setData(new PullRequestReviewerRemoveData(reviewer.getDisplayName()));+ pullRequestChangeManager.save(change);+ return true;+ } else {+ return false;+ }}}@@ -96,6 +111,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRsave(review);PullRequest request = review.getRequest();+ request.getReviews().add(review);PullRequestChange change = new PullRequestChange();change.setDate(new Date());@@ -108,20 +124,19 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR@Transactional@Overridepublic void saveReviews(PullRequest request) {- Collection<Long> ids = new HashSet<>();- for (PullRequestReview review: request.getReviews()) {- save(review);- ids.add(review.getId());- }- if (!ids.isEmpty()) {- Query query = getSession().createQuery("delete from PullRequestReview where request=:request and id not in (:ids)");+ Collection<User> reviewers = request.getReviews().stream()+ .filter(it->!it.isNew()).map(it->it.getUser()).collect(Collectors.toList());+ if (!reviewers.isEmpty()) {+ Query query = getSession().createQuery("delete from PullRequestReview where request=:request and user not in (:reviewers)");query.setParameter("request", request);- query.setParameter("ids", ids);+ query.setParameter("reviewers", reviewers);query.executeUpdate();} else {Query query = getSession().createQuery("delete from PullRequestReview where request=:request");query.setParameter("request", request);query.executeUpdate();}+ for (PullRequestReview review: request.getReviews())+ save(review);}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.javanew file mode 100644index 0000000000..66273f929e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java@@ -0,0 +1,55 @@+package io.onedev.server.entitymanager.impl;++import java.util.Collection;+import java.util.stream.Collectors;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.Query;++import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.PullRequestVerificationManager;+import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;+import io.onedev.server.model.Build;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>+ implements PullRequestVerificationManager {++ private final ListenerRegistry listenerRegistry;++ @Inject+ public DefaultPullRequestVerificationManager(Dao dao, ListenerRegistry listenerRegistry) {+ super(dao);+ this.listenerRegistry = listenerRegistry;+ }++ @Transactional+ @Override+ public void saveVerifications(PullRequest request) {+ Collection<Build> builds = request.getVerifications().stream()+ .filter(it->!it.isNew()).map(it->it.getBuild()).collect(Collectors.toList());+ if (!builds.isEmpty()) {+ Query query = getSession().createQuery("delete from PullRequestVerification where request=:request and build not in (:builds)");+ query.setParameter("request", request);+ query.setParameter("builds", builds);+ query.executeUpdate();+ } else {+ Query query = getSession().createQuery("delete from PullRequestVerification where request=:request");+ query.setParameter("request", request);+ query.executeUpdate();+ }+ for (PullRequestVerification build: request.getVerifications()) {+ boolean isNew = build.isNew();+ save(build);+ if (isNew)+ listenerRegistry.post(new PullRequestVerificationEvent(build));+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 98c9ae605b..650febe065 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -94,44 +94,44 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements R@Transactionalpublic void setupDefaults() {- Role developer = new Role();- developer.setName("Developer");- developer.setCodePrivilege(CodePrivilege.WRITE);- developer.setScheduleIssues(true);- developer.setEditableIssueFields(new AllIssueFields());+ Role codeWriter = new Role();+ codeWriter.setName("Code Writer");+ codeWriter.setCodePrivilege(CodePrivilege.WRITE);+ codeWriter.setScheduleIssues(true);+ codeWriter.setEditableIssueFields(new AllIssueFields());JobPrivilege jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");jobPrivilege.setRunJob(true);- developer.getJobPrivileges().add(jobPrivilege);+ codeWriter.getJobPrivileges().add(jobPrivilege);- save(developer, null);+ save(codeWriter, null);- Role tester = new Role();- tester.setName("Tester");- tester.setCodePrivilege(CodePrivilege.READ);- tester.setScheduleIssues(true);- tester.setEditableIssueFields(new AllIssueFields());+ Role codeReader = new Role();+ codeReader.setName("Code Reader");+ codeReader.setCodePrivilege(CodePrivilege.READ);+ codeReader.setScheduleIssues(true);+ codeReader.setEditableIssueFields(new AllIssueFields());jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");jobPrivilege.setAccessLog(true);- tester.getJobPrivileges().add(jobPrivilege);+ codeReader.getJobPrivileges().add(jobPrivilege);- save(tester, null);+ save(codeReader, null);- Role reporter = new Role();- reporter.setName("Reporter");- reporter.setCodePrivilege(CodePrivilege.NONE);+ Role issueReporter = new Role();+ issueReporter.setName("Issue Reporter");+ issueReporter.setCodePrivilege(CodePrivilege.NONE);ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();allfieldsExcept.getExcludeFields().add("Assignees");- reporter.setEditableIssueFields(allfieldsExcept);+ issueReporter.setEditableIssueFields(allfieldsExcept);jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");- reporter.getJobPrivileges().add(jobPrivilege);+ issueReporter.getJobPrivileges().add(jobPrivilege);- save(reporter, null);+ save(issueReporter, null);}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.javaindex f92be66c36..0983dfa1e3 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java@@ -1,7 +1,7 @@package io.onedev.server.event;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class ProjectCreated extends ProjectEvent {diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.javadeleted file mode 100644index 46201c27d0..0000000000--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.event.pullrequest;--import java.util.Date;--import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestBuild;--public class PullRequestBuildEvent extends PullRequestEvent {-- private final PullRequestBuild pullRequestBuild;-- public PullRequestBuildEvent(PullRequestBuild pullRequestBuild) {- super(null, new Date(), pullRequestBuild.getRequest());- this.pullRequestBuild = pullRequestBuild;- }-- public PullRequestBuild getPullRequestBuild() {- return pullRequestBuild;- }-- @Override- public String getActivity(boolean withEntity) {- Build build = pullRequestBuild.getBuild();- String activity = build.getJobName() + " ";- if (build.getVersion() != null)- activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";- else- activity = "build #" + build.getNumber();- activity += " is " + build.getStatus().getDisplayName();- if (withEntity)- activity += " for pull request " + pullRequestBuild.getRequest().describe();- return activity;- }--}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.javanew file mode 100644index 0000000000..8bdd35e4c3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java@@ -0,0 +1,35 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import io.onedev.server.model.Build;+import io.onedev.server.model.PullRequestVerification;++public class PullRequestVerificationEvent extends PullRequestEvent {++ private final PullRequestVerification verification;++ public PullRequestVerificationEvent(PullRequestVerification verification) {+ super(null, new Date(), verification.getRequest());+ this.verification = verification;+ }++ public PullRequestVerification getVerification() {+ return verification;+ }++ @Override+ public String getActivity(boolean withEntity) {+ Build build = verification.getBuild();+ String activity = build.getJobName() + " ";+ if (build.getVersion() != null)+ activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";+ else+ activity = "build #" + build.getNumber();+ activity += " is " + build.getStatus().getDisplayName();+ if (withEntity)+ activity += " for pull request " + verification.getRequest().describe();+ return activity;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex a2a012c16a..d5005b4069 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -44,8 +44,8 @@ import io.onedev.server.git.exception.GitException;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.CodePullAuthorizationSource;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ServerConfig;import io.onedev.server.util.concurrent.PrioritizedRunnable;import io.onedev.server.util.work.WorkExecutor;diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.javaindex d29e1caaf8..e9d45c8a2e 100644--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java@@ -32,9 +32,9 @@ import io.onedev.server.git.command.ReceivePackCommand;import io.onedev.server.git.command.UploadPackCommand;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.ssh.SshAuthenticator;import io.onedev.server.ssh.SshCommandCreator;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ServerConfig;import io.onedev.server.util.concurrent.PrioritizedRunnable;import io.onedev.server.util.work.WorkExecutor;diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex 99dc5c47b1..a53617cdc1 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -399,13 +399,18 @@ public class GitUtils {merger.setBase(commit.getParent(0));if (merger.merge(headCommit, commit)) {if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) {- CommitBuilder newCommit = new CommitBuilder();- newCommit.setAuthor(commit.getAuthorIdent());- newCommit.setCommitter(committer);- newCommit.setParentId(headCommit);- newCommit.setMessage(commit.getFullMessage());- newCommit.setTreeId(merger.getResultTreeId());- headCommit = revWalk.parseCommit(inserter.insert(newCommit));+ if (!commit.getTree().getId().equals(merger.getResultTreeId())+ || !commit.getParent(0).equals(headCommit)) {+ CommitBuilder commitBuilder = new CommitBuilder();+ commitBuilder.setAuthor(commit.getAuthorIdent());+ commitBuilder.setCommitter(committer);+ commitBuilder.setParentId(headCommit);+ commitBuilder.setMessage(commit.getFullMessage());+ commitBuilder.setTreeId(merger.getResultTreeId());+ headCommit = revWalk.parseCommit(inserter.insert(commitBuilder));+ } else {+ headCommit = commit;+ }}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.javaindex 36df5e6b87..6985d1499f 100644--- a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java@@ -27,7 +27,7 @@ import io.onedev.server.event.RefUpdated;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@SuppressWarnings("serial")@Singletondiff --git a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.javaindex 61ce8d09bb..9d33d28a09 100644--- a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPreReceiveCallback.java@@ -34,9 +34,9 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.util.SecurityUtils;@SuppressWarnings("serial")@Singletondiff --git a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.javaindex a24230542a..dd7ad7fa0b 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java@@ -80,4 +80,6 @@ public interface CommitInfoManager {Collection<ObjectId> getFixCommits(Project project, Long issueNumber);+ void sortUsersByContribution(List<User> users, Project project, Collection<String> files);+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex e747e01cc5..800511bc5b 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -96,6 +96,8 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate static final int MAX_HISTORY_PATHS = 100;+ private static final int MAX_COMMIT_FILES = 100;+private static final String INFO_DIR = "commit";private static final String DEFAULT_STORE = "default";@@ -1478,6 +1480,55 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme});}++ @Override+ public void sortUsersByContribution(List<User> users, Project project, Collection<String> files) {+ if (users.size() <= 1)+ return;++ Map<User, Long> commitCounts = new HashMap<>();+ for (User user: users)+ commitCounts.put(user, 0L);++ int count = 0;+ for (String path: files) {+ int addedCommitCount = addCommitCounts(project, commitCounts, path);+ while (addedCommitCount == 0) {+ if (path.contains("/")) {+ path = StringUtils.substringBeforeLast(path, "/");+ addedCommitCount = addCommitCounts(project, commitCounts, path);+ } else {+ addCommitCounts(project, commitCounts, "");+ break;+ }+ }+ if (++count >= MAX_COMMIT_FILES)+ break;+ }++ Collections.sort(users, new Comparator<User>() {++ @Override+ public int compare(User o1, User o2) {+ if (commitCounts.get(o1) < commitCounts.get(o2))+ return 1;+ else+ return -1;+ }++ });+ }++ private int addCommitCounts(Project project, Map<User, Long> commitCounts, String path) {+ int addedCommitCount = 0;+ for (Map.Entry<User, Long> entry: commitCounts.entrySet()) {+ User user = entry.getKey();+ int commitCount = getCommitCount(project, user, path);+ entry.setValue(entry.getValue() + commitCount);+ addedCommitCount += commitCount;+ }+ return addedCommitCount;+ }private static class NextIndex {int user;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 902affb85c..649fdd0594 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -251,7 +251,7 @@ public class DefaultDataManager implements DataManager, Serializable {if (roleManager.get(Role.OWNER_ID) == null) {Role owner = new Role();- owner.setName("Owner");+ owner.setName("Project Owner");owner.setId(Role.OWNER_ID);owner.setManageProject(true);roleManager.replicate(owner);diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 194f586f9c..b2408048c6 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -164,7 +164,7 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_DEPENDENTS = "dependents";- public static final String PROP_PULL_REQUEST_BUILDS = "pullRequestBuilds";+ public static final String PROP_VERIFICATIONS = "verifications";public static final String NAME_ERROR_MESSAGE = "Error Message";@@ -285,7 +285,7 @@ public class Build extends AbstractEntity implements Referenceable {private Collection<BuildDependence> dependents= new ArrayList<>();@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)- private Collection<PullRequestBuild> pullRequestBuilds = new ArrayList<>();+ private Collection<PullRequestVerification> verifications = new ArrayList<>();private transient Map<String, List<String>> paramMap;@@ -430,6 +430,10 @@ public class Build extends AbstractEntity implements Referenceable {|| status == Status.TIMED_OUT;}+ public boolean isSuccessful() {+ return status == Status.SUCCESSFUL;+ }+public Date getSubmitDate() {return submitDate;}@@ -516,12 +520,12 @@ public class Build extends AbstractEntity implements Referenceable {this.updatedRef = updatedRef;}- public Collection<PullRequestBuild> getPullRequestBuilds() {- return pullRequestBuilds;+ public Collection<PullRequestVerification> getVerifications() {+ return verifications;}- public void setPullRequestBuilds(Collection<PullRequestBuild> pullRequestBuilds) {- this.pullRequestBuilds = pullRequestBuilds;+ public void setVerifications(Collection<PullRequestVerification> verifications) {+ this.verifications = verifications;}public Map<String, List<String>> getParamMap() {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex eaf90bfb1b..c3cf3876eb 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -42,9 +42,9 @@ import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.Mark;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.CollectionUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex c7ba7483b4..1f4f33020c 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -62,12 +62,12 @@ import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.Input;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.web.editable.BeanDescriptor;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 1ac768a7aa..ab9bb8285c 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -35,7 +35,6 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import org.apache.commons.lang3.SerializationUtils;-import org.dom4j.Element;import org.eclipse.jgit.api.CreateBranchCommand;import org.eclipse.jgit.api.Git;import org.eclipse.jgit.api.TagCommand;@@ -95,7 +94,6 @@ import io.onedev.server.git.command.ListChangedFilesCommand;import io.onedev.server.git.exception.NotFileException;import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.infomanager.CommitInfoManager;-import io.onedev.server.migration.VersionedXmlDoc;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;@@ -108,10 +106,10 @@ import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;@@ -318,8 +316,6 @@ public class Project extends AbstractEntity {private transient List<Milestone> sortedMilestones;- private transient List<String> jobNames;-@Editable(order=100)@ProjectName@NotEmpty@@ -714,22 +710,11 @@ public class Project extends AbstractEntity {}public List<String> getJobNames() {- if (jobNames == null) {- Set<String> jobNameSet = new HashSet<>();- for (RefInfo refInfo: getBranchRefInfos()) {- Blob blob = getBlob(new BlobIdent(refInfo.getPeeledObj().name(),- BuildSpec.BLOB_PATH, FileMode.TYPE_FILE), false);- if (blob != null && blob.getText() != null) {- try {- VersionedXmlDoc dom = VersionedXmlDoc.fromXML(blob.getText().getContent());- for (Element jobElement: dom.getRootElement().element("jobs").elements())- jobNameSet.add(jobElement.elementTextTrim("name"));- } catch (Exception e) {- }- }- }- jobNames = new ArrayList<>(jobNameSet);- Collections.sort(jobNames);+ List<String> jobNames = new ArrayList<>();+ if (getDefaultBranch() != null) {+ BuildSpec buildSpec = getBuildSpec(getObjectId(getDefaultBranch(), true));+ if (buildSpec != null)+ jobNames.addAll(buildSpec.getJobMap().keySet());}return jobNames;}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.javaindex f39ec819a6..4ed038ad92 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@@ -63,6 +63,7 @@ import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.ComponentContext;@@ -70,7 +71,6 @@ import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.jackson.RestView;@@ -162,7 +162,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_REVIEWS = "reviews";- public static final String PROP_PULL_REQUEST_BUILDS = "pullRequestBuilds";+ public static final String PROP_VERIFICATIONS= "verifications";public static final String PROP_UUID = "uuid";@@ -272,7 +272,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate Collection<PullRequestReview> reviews = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)- private Collection<PullRequestBuild> pullRequestBuilds = new ArrayList<>();+ private Collection<PullRequestAssignment> assignments = new ArrayList<>();++ @OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)+ private Collection<PullRequestVerification> verifications = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestComment> comments = new ArrayList<>();@@ -456,12 +459,12 @@ public class PullRequest extends AbstractEntity implements Referenceable, AttachsortedUpdates = null;}- public Collection<PullRequestBuild> getPullRequestBuilds() {- return pullRequestBuilds;+ public Collection<PullRequestVerification> getVerifications() {+ return verifications;}- public void setPullRequestBuilds(Collection<PullRequestBuild> pullRequestBuilds) {- this.pullRequestBuilds = pullRequestBuilds;+ public void setVerifications(Collection<PullRequestVerification> verifications) {+ this.verifications = verifications;}public Collection<PullRequestComment> getComments() {@@ -685,6 +688,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.reviews = reviews;}+ public Collection<PullRequestAssignment> getAssignments() {+ return assignments;+ }++ public void setAssignments(Collection<PullRequestAssignment> assignments) {+ this.assignments = assignments;+ }+public String getUUID() {return uuid;}@@ -718,25 +729,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.lastUpdate = lastUpdate;}- public String getCommitMessage() {- if (isNew()) {- return "Pull request merge preview";- } else {- if (mergeStrategy == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {- String commitMessage = getTitle() + "\n\n";- if (getDescription() != null)- commitMessage += getDescription() + "\n\n";- commitMessage += String.format("Squash pull request #%d of project '%s'",- getNumber(), getTargetProject().getName());- return commitMessage;- } else if (mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT || mergeStrategy == MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY) {- return String.format("Merge pull request #%d of project '%s'", getNumber(), getTargetProject().getName());- } else {- throw new IllegalStateException("Unexpected merge strategy: " + mergeStrategy);- }- }- }-@Nullablepublic String getCheckError() {return checkError;@@ -913,17 +905,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic boolean isAllReviewsApproved() {for (PullRequestReview review: getReviews()) {- if (review.getExcludeDate() == null &&- (review.getResult() == null || !review.getResult().isApproved())) {+ if (review.getResult() == null || !review.getResult().isApproved())return false;- }}return true;}public boolean isRequiredBuildsSuccessful() {- for (PullRequestBuild pullRequestBuild: getPullRequestBuilds()) {- if (pullRequestBuild.isRequired() && pullRequestBuild.getBuild().getStatus() != Build.Status.SUCCESSFUL)+ for (PullRequestVerification verification: getVerifications()) {+ if (verification.isRequired() && verification.getBuild().getStatus() != Build.Status.SUCCESSFUL)return false;}return true;@@ -997,8 +987,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public ObjectId getComparisonBase(ObjectId oldCommitId, ObjectId newCommitId) {- if (oldCommitId.equals(newCommitId))- return newCommitId;+ if (isNew() || oldCommitId.equals(newCommitId))+ return oldCommitId;PullRequestInfoManager infoManager = OneDev.getInstance(PullRequestInfoManager.class);ObjectId comparisonBase = infoManager.getComparisonBase(this, oldCommitId, newCommitId);diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.javanew file mode 100644index 0000000000..eaf2a7b351--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestAssignment.java@@ -0,0 +1,46 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_request_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_request_id"})}+)+public class PullRequestAssignment extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String PROP_USER = "user";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private PullRequest request;++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public PullRequest getRequest() {+ return request;+ }++ public void setRequest(PullRequest request) {+ this.request = request;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex 7eb638fd7f..cd0a747b5a 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -1,6 +1,5 @@package io.onedev.server.model;-import java.util.Date;import java.util.Optional;import javax.annotation.Nullable;@@ -13,7 +12,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.ReviewResult;@Entity@@ -39,8 +37,6 @@ public class PullRequestReview extends AbstractEntity {@JoinColumn(nullable=false)private PullRequest request;- private Date excludeDate;-@Embeddedprivate ReviewResult result;@@ -71,29 +67,15 @@ public class PullRequestReview extends AbstractEntity {this.result = result;}- public Date getExcludeDate() {- return excludeDate;- }-- public void setExcludeDate(Date excludeDate) {- this.excludeDate = excludeDate;- result = null;- }-@Nullablepublic PullRequestUpdate getUpdate() {if (updateOptional == null) {PullRequestUpdate update = null;if (result != null) {- MergePreview preview = request.getMergePreview();- if (preview != null && result.getCommit().equals(preview.getMergeCommitHash())) {- update = request.getLatestUpdate();- } else {- for (PullRequestUpdate each: request.getUpdates()) {- if (each.getHeadCommitHash().equals(result.getCommit())) {- update = each;- break;- }+ for (PullRequestUpdate each: request.getUpdates()) {+ if (each.getHeadCommitHash().equals(result.getCommit())) {+ update = each;+ break;}}}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/server-core/src/main/java/io/onedev/server/model/PullRequestVerification.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/PullRequestBuild.javarename to server-core/src/main/java/io/onedev/server/model/PullRequestVerification.javaindex 7c74035d23..9969bde851 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestVerification.java@@ -12,7 +12,7 @@ import javax.persistence.UniqueConstraint;@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_build_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_build_id"})})-public class PullRequestBuild extends AbstractEntity {+public class PullRequestVerification extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 72a67aa367..2809a0f012 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -26,6 +26,7 @@ import io.onedev.server.model.support.role.AllIssueFields;import io.onedev.server.model.support.role.CodePrivilege;import io.onedev.server.model.support.role.IssueFieldSet;import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.AccessBuildReports;@@ -43,7 +44,6 @@ import io.onedev.server.security.permission.RunJob;import io.onedev.server.security.permission.ScheduleIssues;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.EditContext;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.ShowCondition;diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 705174a22a..870115bc56 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -41,7 +41,7 @@ import io.onedev.server.model.support.administration.authenticator.Authenticatorimport io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.util.validation.annotation.UserName;@@ -101,10 +101,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {private Collection<Membership> memberships = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestReview> reviews = new ArrayList<>();+ private Collection<PullRequestReview> pullRequestReviews = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestAssignment> pullRequestAssignments = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestWatch> requestWatches = new ArrayList<>();+ private Collection<PullRequestWatch> pullRequestWatches = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<IssueWatch> issueWatches = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex da5eb6c130..da6c8f8682 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -248,9 +248,18 @@ public class BranchProtection implements Serializable {* @return* result of the check.*/- public boolean isReviewRequiredForModification(User user, Project project, String branch, @Nullable String file) {- return !getParsedReviewRequirement().satisfied(user)- || file != null && !getFileProtection(file).getParsedReviewRequirement().satisfied(user);+ public boolean isReviewRequiredForModification(User user, Project project,+ String branch, @Nullable String file) {+ ReviewRequirement requirement = getParsedReviewRequirement();+ if (!requirement.getUsers().isEmpty() || !requirement.getGroups().isEmpty())+ return true;++ if (file != null) {+ requirement = getFileProtection(file).getParsedReviewRequirement();+ return !requirement.getUsers().isEmpty() || !requirement.getGroups().isEmpty();+ }++ return false;}public boolean isBuildRequiredForModification(Project project, String branch, @Nullable String file) {@@ -275,13 +284,16 @@ public class BranchProtection implements Serializable {*/public boolean isReviewRequiredForPush(User user, Project project, String branch, ObjectId oldObjectId,ObjectId newObjectId, Map<String, String> gitEnvs) {- if (!getParsedReviewRequirement().satisfied(user))+ ReviewRequirement requirement = getParsedReviewRequirement();+ if (!requirement.getUsers().isEmpty() || !requirement.getGroups().isEmpty())return true;-+for (String changedFile: project.getChangedFiles(oldObjectId, newObjectId, gitEnvs)) {- if (!getFileProtection(changedFile).getParsedReviewRequirement().satisfied(user))+ requirement = getFileProtection(changedFile).getParsedReviewRequirement();+ if (!requirement.getUsers().isEmpty() || !requirement.getGroups().isEmpty())return true;}+return false;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex f5b3895a48..8253b29257 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -183,7 +183,7 @@ public class GlobalIssueSetting implements Serializable {transition.setToState("Closed");PressButtonTrigger pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Close");- pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));+ pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader"));transition.setTrigger(pressButton);transitionSpecs.add(transition);@@ -223,7 +223,7 @@ public class GlobalIssueSetting implements Serializable {transition.setToState("Open");pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Reopen");- pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));+ pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader"));transition.setTrigger(pressButton);transitionSpecs.add(transition);diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.javaindex 79963deabe..721b39ece8 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java@@ -7,7 +7,7 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.util.WicketUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 98f6ae08f9..a995765ffe 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -12,7 +12,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex dc3fff9f72..88039af642 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -15,20 +15,20 @@ public enum MergeStrategy {CREATE_MERGE_COMMIT("Add all commits from source branch to target branch with a merge commit.") {@Override- public ObjectId merge(PullRequest request) {+ public ObjectId merge(PullRequest request, String commitMessage) {PersonIdent user = new PersonIdent(OneDev.NAME, "");Repository repository = request.getTargetProject().getRepository();ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();return GitUtils.merge(repository, targetHead, requestHead, false, user, user,- request.getCommitMessage(), false);+ commitMessage, false);}},CREATE_MERGE_COMMIT_IF_NECESSARY("Only create merge commit if target branch can not be fast-forwarded to source branch") {@Override- public ObjectId merge(PullRequest request) {+ public ObjectId merge(PullRequest request, String commitMessage) {Repository repository = request.getTargetProject().getRepository();ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();@@ -37,7 +37,7 @@ public enum MergeStrategy {} else {PersonIdent user = new PersonIdent(OneDev.NAME, "");return GitUtils.merge(repository, targetHead, requestHead, false, user, user,- request.getCommitMessage(), false);+ commitMessage, false);}}@@ -45,20 +45,21 @@ public enum MergeStrategy {SQUASH_SOURCE_BRANCH_COMMITS("Squash all commits from source branch into a single commit in target branch") {@Override- public ObjectId merge(PullRequest request) {+ public ObjectId merge(PullRequest request, String commitMessage) {Repository repository = request.getTargetProject().getRepository();ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();- PersonIdent user = new PersonIdent(OneDev.NAME, "");- return GitUtils.merge(repository, targetHead, requestHead, true, user, user,- request.getCommitMessage(), false);+ PersonIdent committer = new PersonIdent(OneDev.NAME, "");+ PersonIdent author = request.getSubmitter().asPerson();+ return GitUtils.merge(repository, targetHead, requestHead, true, committer, author,+ commitMessage, false);}},REBASE_SOURCE_BRANCH_COMMITS("Rebase all commits from source branch onto target branch") {@Override- public ObjectId merge(PullRequest request) {+ public ObjectId merge(PullRequest request, String commitMessage) {Repository repository = request.getTargetProject().getRepository();ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();@@ -88,6 +89,6 @@ public enum MergeStrategy {}@Nullable- public abstract ObjectId merge(PullRequest request);+ public abstract ObjectId merge(PullRequest request, String commitMessage);}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.javanew file mode 100644index 0000000000..651d39aeff--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.pullrequest.changedata;++import org.apache.wicket.Component;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.util.CommentSupport;++public class PullRequestAssigneeAddData implements PullRequestChangeData {++ private static final long serialVersionUID = 1L;++ private final String assignee;++ public PullRequestAssigneeAddData(String assignee) {+ this.assignee = assignee;+ }++ @Override+ public String getActivity(PullRequest withRequest) {+ String activity = "added assignee \"" + assignee + "\"";+ if (withRequest != null)+ activity += " in pull request " + withRequest.describe();+ return activity;+ }++ @Override+ public CommentSupport getCommentSupport() {+ return null;+ }++ @Override+ public Component render(String componentId, PullRequestChange change) {+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.javanew file mode 100644index 0000000000..5d198d241d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.pullrequest.changedata;++import org.apache.wicket.Component;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.util.CommentSupport;++public class PullRequestAssigneeRemoveData implements PullRequestChangeData {++ private static final long serialVersionUID = 1L;++ private final String assignee;++ public PullRequestAssigneeRemoveData(String assignee) {+ this.assignee = assignee;+ }++ @Override+ public String getActivity(PullRequest withRequest) {+ String activity = "removed assignee \"" + assignee + "\"";+ if (withRequest != null)+ activity += " in pull request " + withRequest.describe();+ return activity;+ }++ @Override+ public CommentSupport getCommentSupport() {+ return null;+ }++ @Override+ public Component render(String componentId, PullRequestChange change) {+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex eb8c65703d..ec0c783977 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -19,7 +19,6 @@ import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.entity.EntityPersisted;-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;@@ -28,8 +27,10 @@ import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.event.pullrequest.PullRequestUpdated;+import io.onedev.server.event.pullrequest.PullRequestVerificationEvent;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;@@ -45,7 +46,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.QueryWatchBuilder;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MentionParser;@@ -172,7 +173,7 @@ public class PullRequestNotificationManager {if (event instanceof PullRequestOpened) {for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null && review.getResult() == null) {+ if (review.getResult() == null) {// reviewers will be sent review invitation separatelynotifiedUsers.add(review.getUser());}@@ -232,7 +233,7 @@ public class PullRequestNotificationManager {|| changeData instanceof PullRequestReopenData) {notifyWatchers = true;}- } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {+ } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestVerificationEvent)) {notifyWatchers = true;}@@ -265,26 +266,32 @@ public class PullRequestNotificationManager {}}- private void inviteToReview(PullRequestReview review) {- PullRequest request = review.getRequest();- String url = urlManager.urlFor(request);- String subject = String.format("You are invited to review pull request %s", request.describe());- String htmlBody = String.format("Visit <a href='%s'>%s</a> for details", url, url);- String textBody = String.format("Visit %s for details", url, url);- mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), subject, htmlBody, textBody);- }-@Transactional@Listenpublic void on(EntityPersisted event) {- if (event.isNew() && event.getEntity() instanceof PullRequestReview) {- PullRequestReview review = (PullRequestReview) event.getEntity();- PullRequest request = review.getRequest();- if (review.getExcludeDate() == null- && review.getResult() == null- && !review.getUser().equals(SecurityUtils.getUser())) {- pullRequestWatchManager.watch(request, review.getUser(), true);- inviteToReview(review);+ if (event.isNew()) {+ if (event.getEntity() instanceof PullRequestReview) {+ PullRequestReview review = (PullRequestReview) event.getEntity();+ PullRequest request = review.getRequest();+ if (review.getResult() == null && !review.getUser().equals(SecurityUtils.getUser())) {+ pullRequestWatchManager.watch(request, review.getUser(), true);+ String url = urlManager.urlFor(request);+ String subject = String.format("You are invited to review pull request %s", request.describe());+ String htmlBody = String.format("Visit <a href='%s'>%s</a> for details", url, url);+ String textBody = String.format("Visit %s for details", url, url);+ mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), subject, htmlBody, textBody);+ }+ } else if (event.getEntity() instanceof PullRequestAssignment) {+ PullRequestAssignment assignment = (PullRequestAssignment) event.getEntity();+ PullRequest request = assignment.getRequest();+ if (!assignment.getUser().equals(SecurityUtils.getUser())) {+ pullRequestWatchManager.watch(request, assignment.getUser(), true);+ String url = urlManager.urlFor(request);+ String subject = String.format("You are assigned and expected to merge pull request %s", request.describe());+ String htmlBody = String.format("Visit <a href='%s'>%s</a> for details", url, url);+ String textBody = String.format("Visit %s for details", url, url);+ mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()), subject, htmlBody, textBody);+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.javaindex 59f9e36a9b..d0093e171d 100644--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Path("/builds")@Consumes(MediaType.WILDCARD)diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex e408398069..51f3c20517 100644--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Path("/projects")@Consumes(MediaType.WILDCARD)diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 97ea918cf6..7cfb4bfa0b 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -24,7 +24,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Path("/pulls")@Consumes(MediaType.WILDCARD)diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.javaindex 3ce8836253..6c1d004e34 100644--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java@@ -23,7 +23,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Path("/users")@Consumes(MediaType.WILDCARD)diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.javaindex f32f594054..27980b61bc 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class AuthorCriteria extends CommitCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.javaindex d889f41cc8..107350fcec 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class CommitterCriteria extends CommitCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javaindex 59193e736a..8335d085e3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -29,15 +29,15 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_PULL_REQUEST_BUILDS, JoinType.LEFT);- join.on(builder.equal(join.get(PullRequestBuild.PROP_REQUEST), request));+ Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);+ join.on(builder.equal(join.get(PullRequestVerification.PROP_REQUEST), request));return builder.equal(root.get(Build.PROP_PROJECT), request.getTargetProject());}@Overridepublic boolean matches(Build build) {return build.getProject().equals(request.getTargetProject())- && build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request));+ && build.getVerifications().stream().anyMatch(it -> it.getRequest().equals(request));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.javaindex 3031cd8755..2b592bc371 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java@@ -14,12 +14,12 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- return builder.isNotEmpty(root.get(Build.PROP_PULL_REQUEST_BUILDS));+ return builder.isNotEmpty(root.get(Build.PROP_VERIFICATIONS));}@Overridepublic boolean matches(Build build) {- return !build.getPullRequestBuilds().isEmpty();+ return !build.getVerifications().isEmpty();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javaindex e7e0891779..8ab5a3b196 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -29,17 +29,17 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_PULL_REQUEST_BUILDS, JoinType.LEFT);+ Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);join.on(builder.and(- builder.equal(join.get(PullRequestBuild.PROP_REQUEST), request),- builder.equal(join.get(PullRequestBuild.PROP_REQUIRED), true)));+ builder.equal(join.get(PullRequestVerification.PROP_REQUEST), request),+ builder.equal(join.get(PullRequestVerification.PROP_REQUIRED), true)));return builder.equal(root.get(Build.PROP_PROJECT), request.getTargetProject());}@Overridepublic boolean matches(Build build) {return build.getProject().equals(request.getTargetProject())- && build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request) && it.isRequired());+ && build.getVerifications().stream().anyMatch(it -> it.getRequest().equals(request) && it.isRequired());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.javaindex 72fcd532a4..63ab927a08 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.search.entity.EntityCriteria;public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {@@ -16,14 +16,14 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(Build.PROP_PULL_REQUEST_BUILDS, JoinType.LEFT);- join.on(builder.equal(join.get(PullRequestBuild.PROP_REQUIRED), true));+ Join<?, ?> join = root.join(Build.PROP_VERIFICATIONS, JoinType.LEFT);+ join.on(builder.equal(join.get(PullRequestVerification.PROP_REQUIRED), true));return join.isNotNull();}@Overridepublic boolean matches(Build build) {- return build.getPullRequestBuilds().stream().anyMatch(it->it.isRequired());+ return build.getVerifications().stream().anyMatch(it->it.isRequired());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 261cbc6646..21ec73e4fc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -22,8 +22,8 @@ import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;import io.onedev.server.model.support.issue.fieldspec.CommitField;import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedCommit;-import io.onedev.server.util.SecurityUtils;public class FieldOperatorCriteria extends FieldCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex b0b5c2cb41..8b866ba958 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -40,8 +40,7 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(this.user);- return review != null && review.getExcludeDate() == null && review.getResult() != null- && review.getResult().isApproved();+ return review != null && review.getResult() != null && review.getResult().isApproved();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex c96d9f630d..eaa1014439 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -40,10 +40,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null- && review.getExcludeDate() == null- && review.getResult() != null- && review.getResult().isApproved();+ return review != null && review.getResult() != null && review.getResult().isApproved();} else {throw new OneException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex fff05d7b4d..ca4390948e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.search.entity.EntityCriteria;public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {@@ -19,8 +19,8 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root- .join(PullRequest.PROP_PULL_REQUEST_BUILDS, JoinType.LEFT)- .join(PullRequestBuild.PROP_BUILD, JoinType.INNER);+ .join(PullRequest.PROP_VERIFICATIONS, JoinType.LEFT)+ .join(PullRequestVerification.PROP_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);join.on(builder.or(@@ -32,7 +32,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {- for (PullRequestBuild build: request.getPullRequestBuilds()) {+ for (PullRequestVerification build: request.getVerifications()) {if (build.getBuild().getStatus() == Build.Status.FAILED|| build.getBuild().getStatus() == Build.Status.CANCELLED|| build.getBuild().getStatus() == Build.Status.TIMED_OUT) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex ec2baa96c4..81fb1b135c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -33,7 +33,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null && review.getResult() == null)+ if (review.getResult() == null)return true;}return false;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 52d89c0919..d4735d0f24 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -40,8 +40,7 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(this.user);- return review != null && review.getExcludeDate() == null && review.getResult() != null- && !review.getResult().isApproved();+ return review != null && review.getResult() != null && !review.getResult().isApproved();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex d1578b5593..5dd80e388c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -40,10 +40,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null- && review.getExcludeDate() == null- && review.getResult() != null- && !review.getResult().isApproved();+ return review != null && review.getResult() != null && !review.getResult().isApproved();} else {throw new OneException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex b77aa232ff..ac2e1dc227 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -33,7 +33,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque@Overridepublic boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved())+ if (review.getResult() != null && !review.getResult().isApproved())return true;}return false;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex 4dcfdaec35..7faa79ae52 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -40,7 +40,7 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(user);- return review != null && review.getExcludeDate() == null && review.getResult() == null;+ return review != null && review.getResult() == null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 7393406e61..91ccd6721e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -40,9 +40,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null- && review.getExcludeDate() == null- && review.getResult() == null;+ return review != null && review.getResult() == null;} else {throw new OneException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex 5f137fc55b..1487399509 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.search.entity.EntityCriteria;public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {@@ -19,8 +19,8 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root- .join(PullRequest.PROP_PULL_REQUEST_BUILDS, JoinType.LEFT)- .join(PullRequestBuild.PROP_BUILD, JoinType.INNER);+ .join(PullRequest.PROP_VERIFICATIONS, JoinType.LEFT)+ .join(PullRequestVerification.PROP_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);join.on(builder.or(builder.equal(status, Build.Status.RUNNING),@@ -32,7 +32,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {- for (PullRequestBuild build: request.getPullRequestBuilds()) {+ for (PullRequestVerification build: request.getVerifications()) {if (build.getBuild().getStatus() == Build.Status.RUNNING|| build.getBuild().getStatus() == Build.Status.PENDING|| build.getBuild().getStatus() == Build.Status.WAITING) {diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 494662a234..0284fe9952 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -78,7 +78,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final TransactionManager transactionManager;@SuppressWarnings("serial")- private final MetaDataKey<Map<Long, AuthorizationInfo>> authorizationInfosKey =+ private static final MetaDataKey<Map<Long, AuthorizationInfo>> AUTHORIZATION_INFOS =new MetaDataKey<Map<Long, AuthorizationInfo>>() {};@Inject@@ -172,10 +172,10 @@ public class OneAuthorizingRealm extends AuthorizingRealm {Long userId = (Long) principals.getPrimaryPrincipal();RequestCycle requestCycle = RequestCycle.get();if (requestCycle != null) {- Map<Long, AuthorizationInfo> authorizationInfos = requestCycle.getMetaData(authorizationInfosKey);+ Map<Long, AuthorizationInfo> authorizationInfos = requestCycle.getMetaData(AUTHORIZATION_INFOS);if (authorizationInfos == null) {authorizationInfos = new HashMap<>();- requestCycle.setMetaData(authorizationInfosKey, authorizationInfos);+ requestCycle.setMetaData(AUTHORIZATION_INFOS, authorizationInfos);}AuthorizationInfo authorizationInfo = authorizationInfos.get(userId);if (authorizationInfo == null) {diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javasimilarity index 99%rename from server-core/src/main/java/io/onedev/server/util/SecurityUtils.javarename to server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 99251cd09b..736694834b 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.security;import java.util.ArrayList;import java.util.Collection;diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex b64aef3400..6037e6be9a 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -20,6 +20,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.javaindex 3c23e509b5..afb730c944 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java@@ -18,7 +18,7 @@ import io.onedev.commons.utils.PathUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.UrlUtils;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex 0d8343ca99..d9300c84aa 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -114,23 +114,6 @@ public class ReviewRequirement {return groups;}- public boolean satisfied(User user) {- for (User eachUser: users) {- if (!eachUser.equals(user))- return false;- }- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {- Group group = entry.getKey();- int requiredCount = entry.getValue();- if (requiredCount == 0 || requiredCount > group.getMembers().size())- requiredCount = group.getMembers().size();-- if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))- return false;- }- return true;- }-@Nullablepublic static String onRenameGroup(@Nullable String reviewRequirementString, String oldName, String newName) {ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);diff --git a/server-core/src/main/java/io/onedev/server/util/schedule/DefaultTaskScheduler.java b/server-core/src/main/java/io/onedev/server/util/schedule/DefaultTaskScheduler.javaindex be02f88cb1..3c16fade4e 100644--- a/server-core/src/main/java/io/onedev/server/util/schedule/DefaultTaskScheduler.java+++ b/server-core/src/main/java/io/onedev/server/util/schedule/DefaultTaskScheduler.java@@ -23,7 +23,7 @@ import org.quartz.impl.StdSchedulerFactory;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@Singletonpublic class DefaultTaskScheduler implements TaskScheduler {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.javaindex 9435024114..891b0b063b 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java@@ -6,7 +6,7 @@ import javax.validation.ConstraintValidatorContext;import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.authc.UsernamePasswordToken;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.validation.annotation.CurrentPassword;public class CurrentPasswordValidator implements ConstraintValidator<CurrentPassword, String> {diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.javaindex eccec7fa93..96849970dc 100644--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.concurrent.PrioritizedRunnable;diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.javaindex 8218efe5ac..b5756e1f0c 100644--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java+++ b/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java@@ -16,7 +16,7 @@ import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.concurrent.PrioritizedCallable;import io.onedev.server.util.concurrent.PrioritizedFutureTask;import io.onedev.server.util.concurrent.PrioritizedRunnable;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.javaindex b4b1fa957f..79e76c6488 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java@@ -84,7 +84,7 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {InputCompletion completion;if (appendTitle) {String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent()- + ": " + suggestion.getDescription();+ + " - " + suggestion.getDescription();completion = new InputCompletion(suggestion.getContent(),content + inputStatus.getContentAfterCaret(), content.length(),suggestion.getDescription(), suggestion.getMatch());diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.javaindex 0e4ba5cf05..05b9c8dc6e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java@@ -7,8 +7,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;import io.onedev.server.git.BlobIdent;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.javaindex 155fa322f3..4d681d7b2b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.javaindex b5b6d4454d..ffa6797ce6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java@@ -17,7 +17,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@SuppressWarnings("serial")abstract class CreateBranchPanel extends Panel {diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex 3f1da457f6..b3d85537fc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -16,7 +16,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.project.ProjectPicker;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex fbc1189607..f7e5958d16 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -62,9 +62,9 @@ import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.JobCriteria;import io.onedev.server.search.entity.build.NumberCriteria;import io.onedev.server.search.entity.build.VersionCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.BuildQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 0cb7a09e96..52ffa09fba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -34,9 +34,9 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.ParamValuesLabel;@@ -264,7 +264,7 @@ public abstract class BuildSidePanel extends Panel {@Overrideprotected List<PullRequest> load() {- return getBuild().getPullRequestBuilds()+ return getBuild().getVerifications().stream().map(it->it.getRequest()).collect(Collectors.toList());diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 8e4d1fff19..5c82f12660 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -51,8 +51,8 @@ import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.ContentCriteria;import io.onedev.server.search.entity.codecomment.PathCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.CodeCommentQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 6eb692ef66..03a29ec376 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -49,8 +49,8 @@ import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.asset.caret.CaretResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.javaindex a1736b39f1..d63a7c0800 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java@@ -10,7 +10,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex a7b1c32618..e7716fe1a4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -64,9 +64,9 @@ import io.onedev.server.search.commit.MessageCriteria;import io.onedev.server.search.commit.PathCriteria;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.behavior.CommitQueryBehavior;import io.onedev.server.web.component.commit.message.CommitMessagePanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 05eee32073..0b3957d0e8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -34,8 +34,8 @@ import io.onedev.server.buildspec.job.Job;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.javaindex 22fe5389db..9027b7736e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.Constants;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.javaindex f50834176e..ae373f310b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java@@ -22,7 +22,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;@SuppressWarnings("serial")public abstract class CreateTagPanel extends Panel {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex a917544e25..5886d6b3cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -58,9 +58,9 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.hit.QueryHit;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.RangeUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.DiffBlock;import io.onedev.server.util.diff.DiffMatchPatch.Operation;import io.onedev.server.util.diff.DiffUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex b6b7db0a58..51e17856e8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -80,9 +80,9 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.IndexManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.PathComparator;import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.util.match.Matcher;diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.javaindex 94ccf1a874..7fcacf6aee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java@@ -18,7 +18,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex c9abef826e..ddf1f522d3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -44,11 +44,16 @@ onedev.server.floating = {var openTriggered = false;$floating.data("afterElementReplace", function() {- if ($floating.data("alignment"))- $floating.align($floating.data("alignment"));- if (!openTriggered) {- $floating.trigger("open");- openTriggered = true;+ var alignment = $floating.data("alignment");+ if (alignment && alignment.target && alignment.target.element+ && !document.body.contains(alignment.target.element)) {+ onedev.server.floating.close($floating, true);+ } else {+ $floating.align(alignment);+ if (!openTriggered) {+ $floating.trigger("open");+ openTriggered = true;+ }}});$(document).on("afterElementReplace", $floating.data("afterElementReplace"));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 1047ed0c34..9cecb31688 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -48,7 +48,7 @@ import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeDatimport io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.issue.activities.activity.IssueActivity;import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.javaindex ee31ccb1c8..5135e86faf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java@@ -12,7 +12,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.DiffSupport;import io.onedev.server.web.component.diff.plain.PlainDiffPanel;import io.onedev.server.web.component.markdown.AttachmentSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex 6d5560a32c..661a768330 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -13,8 +13,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.project.comment.ProjectCommentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex 6620fd61bb..b04ae9c511 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -13,8 +13,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.project.comment.ProjectCommentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex aaf50f5837..6761f49ad1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -28,8 +28,8 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.milestone.choice.MilestoneSingleChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 59b76736b4..bbe5e7e078 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -36,11 +36,11 @@ import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.user.ident.Mode;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex f61862adc4..441d20f67e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -41,8 +41,8 @@ import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 0bfb8af365..18662f24b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -59,10 +59,10 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.NumberCriteria;import io.onedev.server.search.entity.issue.TitleCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.IssueQueryBehavior;@@ -612,7 +612,7 @@ public abstract class IssueListPanel extends Panel {}.setEscapeModelStrings(false).setOutputMarkupId(true));- fragment.add(new CopyToClipboardLink("copy", Model.of("#" + issue.getNumber() + ": " + issue.getTitle())));+ fragment.add(new CopyToClipboardLink("copy", Model.of(issue.describe())));fragment.add(new Label("votes", issue.getVoteCount()));fragment.add(new Label("comments", issue.getCommentCount()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.javaindex 496e018061..308cb2de66 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java@@ -11,7 +11,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 8921527b1c..e33c28e682 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -57,9 +57,9 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.entity.nav.EntityNavPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex ceda155008..d8198794df 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -36,8 +36,8 @@ import io.onedev.server.model.support.issue.fieldspec.DateField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.behavior.WebSocketObserver;@@ -143,8 +143,7 @@ public abstract class IssueTitlePanel extends Panel {}});- String copyContent = "#" + getIssue().getNumber() + ": " + getIssue().getTitle();- titleViewer.add(new CopyToClipboardLink("copy", Model.of(copyContent)));+ titleViewer.add(new CopyToClipboardLink("copy", Model.of(getIssue().describe())));if (withIssueCreation) {titleViewer.add(new BookmarkablePageLink<Void>("create", NewIssuePage.class) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.javaindex 4d204fca2a..bae28287b2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.javaindex 8224c40a2a..cf98e537f4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java@@ -10,7 +10,7 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 171a601e6d..e93a8fa7db 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -21,7 +21,7 @@ import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 7a9fa87efc..76033e471a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -33,9 +33,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.asset.lozad.LozadResourceReference;import io.onedev.server.web.avatar.AvatarManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.javasimilarity index 71%rename from server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.javarename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.javaindex 79c780f856..dd8f3420d7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModal.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmModalPanel.java@@ -8,36 +8,36 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")-public abstract class ConfirmModal extends ModalPanel {+public abstract class ConfirmModalPanel extends ModalPanel {- public ConfirmModal(AjaxRequestTarget target) {+ public ConfirmModalPanel(AjaxRequestTarget target) {super(target);}@Overrideprotected Component newContent(String id) {- return new ConfirmPanel(id) {+ return new ContentPanel(id) {@Overrideprotected void onConfirm(AjaxRequestTarget target) {- ConfirmModal.this.onConfirm(target);+ ConfirmModalPanel.this.onConfirm(target);close();}@Overrideprotected void onCancel(AjaxRequestTarget target) {close();- ConfirmModal.this.onCancel(target);+ ConfirmModalPanel.this.onCancel(target);}@Overrideprotected String getConfirmMessage() {- return ConfirmModal.this.getConfirmMessage();+ return ConfirmModalPanel.this.getConfirmMessage();}@Overrideprotected String getConfirmInput() {- return ConfirmModal.this.getConfirmInput();+ return ConfirmModalPanel.this.getConfirmInput();}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.htmlsimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.htmlindex a8f187757a..ca0f6a0d1d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.html@@ -16,4 +16,4 @@</div></form></div>-</wicket:panel>\ No newline at end of file+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.javaindex e971c5c613..255e6c8d04 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java@@ -18,9 +18,9 @@ import io.onedev.server.OneException;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")-abstract class ConfirmPanel extends Panel {+abstract class ContentPanel extends Panel {- public ConfirmPanel(String id) {+ public ContentPanel(String id) {super(id);}@@ -57,7 +57,7 @@ abstract class ConfirmPanel extends Panel {onConfirm(target);} catch (OneException e) {error(e.getMessage());- target.add(ConfirmPanel.this);+ target.add(ContentPanel.this);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.javaindex 85fd3bb37b..274ee71d9d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java@@ -5,10 +5,10 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.web.component.modal.confirm.ConfirmModal;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;@SuppressWarnings("serial")-public abstract class ConfirmDeleteProjectModal extends ConfirmModal {+public abstract class ConfirmDeleteProjectModal extends ConfirmModalPanel {public ConfirmDeleteProjectModal(AjaxRequestTarget target) {super(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex cdd6751794..4510d936ba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -19,7 +19,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.javaindex 046b190b9f..99da6d69ee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/gitprotocol/GitProtocolPanel.java@@ -21,7 +21,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.SshSetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex bcc095c440..56cd782780 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -43,8 +43,8 @@ import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.project.NameCriteria;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ProjectQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.javanew file mode 100644index 0000000000..afbe9aa296--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java@@ -0,0 +1,64 @@+package io.onedev.server.web.component.pullrequest.assignment;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestAssignmentManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestAssignment;+import io.onedev.server.model.User;+import io.onedev.server.web.component.select2.SelectToAddChoice;+import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;++@SuppressWarnings("serial")+public class AssigneeChoice extends SelectToAddChoice<User> {++ private final IModel<PullRequest> requestModel;++ public AssigneeChoice(String id, IModel<PullRequest> requestModel) {+ super(id, new AssigneeProvider(requestModel));++ this.requestModel = requestModel;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add assignee...");+ getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));+ }++ @Override+ protected void onDetach() {+ requestModel.detach();++ super.onDetach();+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, User user) {+ PullRequest request = requestModel.getObject();+ PullRequestAssignment assignment = new PullRequestAssignment();+ assignment.setRequest(request);+ assignment.setUser(user);++ if (!request.isNew())+ OneDev.getInstance(PullRequestAssignmentManager.class).addAssignee(assignment);+ else+ request.getAssignments().add(assignment);+ };++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.javanew file mode 100644index 0000000000..e865b97229--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java@@ -0,0 +1,58 @@+package io.onedev.server.web.component.pullrequest.assignment;++import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;++import java.util.List;+import java.util.stream.Collectors;++import org.apache.wicket.model.IModel;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.WriteCode;+import io.onedev.server.util.match.MatchScoreProvider;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.ResponseFiller;+import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;++public class AssigneeProvider extends AbstractUserChoiceProvider {++ private static final long serialVersionUID = 1L;++ private final IModel<PullRequest> requestModel;++ public AssigneeProvider(IModel<PullRequest> requestModel) {+ this.requestModel = requestModel;+ }++ @Override+ public void query(String term, int page, Response<User> response) {+ PullRequest request = requestModel.getObject();+ List<User> assignees = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());+ assignees.retainAll(SecurityUtils.getAuthorizedUsers(request.getTargetProject(), new WriteCode()));+ assignees.removeAll(request.getAssignments().stream().map(it->it.getUser()).collect(Collectors.toSet()));++ new ResponseFiller<User>(response).fill(filterAndSort(assignees, new MatchScoreProvider<User>() {++ @Override+ public double getMatchScore(User object) {+ return object.getMatchScore(term)+ * (assignees.size() - assignees.indexOf(object))+ / assignees.size();+ }++ }), page, WebConstants.PAGE_SIZE);+ }++ @Override+ public void detach() {+ requestModel.detach();++ super.detach();+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListCssResourceReference.javanew file mode 100644index 0000000000..6ee7761772--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.pullrequest.assignment;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class AssignmentListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public AssignmentListCssResourceReference() {+ super(AssignmentListCssResourceReference.class, "assignment-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.htmlnew file mode 100644index 0000000000..baac7c9aa3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html@@ -0,0 +1,19 @@+<wicket:panel>+ <table class="assignments">+ <tr wicket:id="assignments">+ <td class="user pull-left">+ <a wicket:id="user"></a>+ </td>+ <td class="actions">+ <a wicket:id="delete" title="Remove this assignee"><i class="fa fa-trash"></i></a>+ </td>+ </tr>+ <wicket:enclosure>+ <tr class="add-assignee">+ <td colspan="2">+ <input wicket:id="addAssignee" type="hidden" class="form-control">+ </td>+ </tr>+ </wicket:enclosure>+ </table>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.javanew file mode 100644index 0000000000..1b1255bfff--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java@@ -0,0 +1,177 @@+package io.onedev.server.web.component.pullrequest.assignment;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;++import com.google.common.collect.Sets;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestAssignmentManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestAssignment;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;++@SuppressWarnings("serial")+public class AssignmentListPanel extends GenericPanel<PullRequest> {++ private final IModel<List<PullRequestAssignment>> assignmentsModel;++ public AssignmentListPanel(String id, IModel<PullRequest> model) {+ super(id, model);++ assignmentsModel = new LoadableDetachableModel<List<PullRequestAssignment>>() {++ @Override+ protected List<PullRequestAssignment> load() {+ PullRequest request = getPullRequest();+ List<PullRequestAssignment> assignments = new ArrayList<>(request.getAssignments());++ Collections.sort(assignments, new Comparator<PullRequestAssignment>() {++ @Override+ public int compare(PullRequestAssignment o1, PullRequestAssignment o2) {+ if (o1.getId() != null && o2.getId() != null)+ return o1.getId().compareTo(o1.getId());+ else+ return 0;+ }++ });++ return assignments;+ }++ };+ }++ private PullRequest getPullRequest() {+ return getModelObject();+ }++ @Override+ protected void onDetach() {+ assignmentsModel.detach();+ super.onDetach();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ setVisible(!assignmentsModel.getObject().isEmpty() || SecurityUtils.canModify(request) && !request.isMerged());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<PullRequestAssignment>("assignments", assignmentsModel) {++ @Override+ protected void populateItem(ListItem<PullRequestAssignment> item) {+ PullRequestAssignment assignment = item.getModelObject();+ item.add(new UserIdentPanel("user", assignment.getUser(), Mode.AVATAR_AND_NAME));++ PullRequest request = getPullRequest();++ item.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ if (!getPullRequest().isNew()) {+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "+ + "remove assignee '" + item.getModelObject().getUser().getDisplayName() + "'?"));+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ PullRequest request = getPullRequest();+ PullRequestAssignment assignment = item.getModelObject();+ if (request.isNew()) {+ request.getAssignments().remove(assignment);+ target.add(AssignmentListPanel.this);+ } else {+ PullRequestAssignmentManager manager = OneDev.getInstance(PullRequestAssignmentManager.class);+ manager.removeAssignee(assignment);+ }+ assignmentsModel.detach();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(SecurityUtils.canModify(getPullRequest()) && !request.isMerged());+ }++ });+ }++ });++ add(new AssigneeChoice("addAssignee", getModel()) {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, User user) {+ super.onSelect(target, user);+ if (getPullRequest().isNew())+ target.add(AssignmentListPanel.this);+ }++ });++ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ if (isVisibleInHierarchy())+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ });++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new AssignmentListCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.cssnew file mode 100644index 0000000000..27d27aa21a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/assignment-list.css@@ -0,0 +1,19 @@+table.assignments>tbody>tr>td {+ padding: 6px 12px;+}+table.assignments>tbody>tr>td:first-child {+ padding-left: 0;+}+table.assignments>tbody>tr>td:last-child {+ padding-right: 0;+}+table.assignments>tbody>tr:first-child>td {+ padding-top: 0;+}+table.assignments>tbody>tr:last-child>td {+ padding-bottom: 0;+}+table.assignments>tbody>tr>td.actions {+ font-size: 16px;+ text-align: right;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex c5ed483dd9..d03f6fbb40 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -54,9 +54,9 @@ import io.onedev.server.search.entity.pullrequest.NumberCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.search.entity.pullrequest.TitleCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.PullRequestQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.javaindex 98f8360e57..4d7dabbbe5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java@@ -11,7 +11,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewListCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.javaindex d6493cf85f..6496f5a5ca 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.htmlsimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.htmlindex ceb999256d..4f77fd82a9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html@@ -1,9 +1,11 @@<wicket:panel><table class="reviews"><tr wicket:id="reviews">+ <wicket:enclosure><td class="result"><span wicket:id="result"></span></td>+ </wicket:enclosure><td class="user"><a wicket:id="user"></a></td>diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.javaindex 763c212719..65c0172de5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java@@ -1,13 +1,13 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;import java.util.Comparator;-import java.util.Date;import java.util.List;import org.apache.wicket.Component;+import org.apache.wicket.MetaDataKey;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -27,13 +27,12 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.ReviewResult;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.WebSocketObserver;@@ -44,6 +43,8 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;@SuppressWarnings("serial")public class ReviewListPanel extends GenericPanel<PullRequest> {+ private static final MetaDataKey<ArrayList<User>> UNPREFERABLE_REVIEWERS = new MetaDataKey<ArrayList<User>>() {};+private final IModel<List<PullRequestReview>> reviewsModel;public ReviewListPanel(String id, IModel<PullRequest> model) {@@ -54,11 +55,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {@Overrideprotected List<PullRequestReview> load() {PullRequest request = getPullRequest();- List<PullRequestReview> reviews = new ArrayList<>();- for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null)- reviews.add(review);- }+ List<PullRequestReview> reviews = new ArrayList<>(request.getReviews());Collections.sort(reviews, new Comparator<PullRequestReview>() {@@ -112,7 +109,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {WebMarkupContainer result = new WebMarkupContainer("result");if (review.getResult() != null) {if (review.getResult().isApproved())- result.add(AttributeAppender.append("class", "approved fa fa-check"));+ result.add(AttributeAppender.append("class", "approved fa fa-check-circle"));elseresult.add(AttributeAppender.append("class", "request-for-changes fa fa-hand-stop-o"));} else {@@ -158,8 +155,8 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);if (!getPullRequest().isNew()) {- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to remove '"- + item.getModelObject().getUser().getDisplayName() + "' from reviewer list?"));+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "+ + "remove reviewer '" + item.getModelObject().getUser().getDisplayName() + "'?"));}}@@ -167,15 +164,16 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {public void onClick(AjaxRequestTarget target) {PullRequest request = getPullRequest();PullRequestReview review = item.getModelObject();- boolean removed;- review.setExcludeDate(new Date());- if (request.isNew()) {- OneDev.getInstance(PullRequestManager.class).checkQuality(request);- removed = review.getExcludeDate() != null;- } else {- removed = OneDev.getInstance(PullRequestReviewManager.class).excludeReviewer(review);- }- if (!removed) {++ ArrayList<User> unpreferableReviewers = getPage().getMetaData(UNPREFERABLE_REVIEWERS);+ if (unpreferableReviewers == null)+ unpreferableReviewers = new ArrayList<>();+ unpreferableReviewers.remove(review.getUser());+ unpreferableReviewers.add(review.getUser());+ getPage().setMetaData(UNPREFERABLE_REVIEWERS, unpreferableReviewers);++ PullRequestReviewManager manager = OneDev.getInstance(PullRequestReviewManager.class);+ if (!manager.removeReviewer(review, unpreferableReviewers)) {getSession().warn("Reviewer '" + review.getUser().getDisplayName()+ "' is required and can not be removed");} else if (request.isNew()) {@@ -201,7 +199,6 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {@Overrideprotected void onConfigure() {super.onConfigure();-setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.javaindex 9f574e160e..99cecdd2f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementBehavior.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import java.util.ArrayList;import java.util.Iterator;diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementInput.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementInput.javaindex 9bc598f7a1..73e635b28d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewRequirementInput.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.javaindex 3f2f85736b..b0a8b7ae05 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;@@ -28,7 +28,7 @@ public class ReviewerChoice extends SelectToAddChoice<User> {protected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Select user to add as reviewer...");+ getSettings().setPlaceholder("Add reviewer...");getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");@@ -51,18 +51,14 @@ public class ReviewerChoice extends SelectToAddChoice<User> {@Overrideprotected void onSelect(AjaxRequestTarget target, User user) {PullRequest request = requestModel.getObject();- PullRequestReview review = request.getReview(user);- if (review == null) {- review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- } else {- review.setExcludeDate(null);- }-+ PullRequestReview review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+if (!request.isNew())OneDev.getInstance(PullRequestReviewManager.class).addReviewer(review);+ else+ request.getReviews().add(review);};}diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.javarename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.javaindex 5787c038ee..2f9d6eab69 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java@@ -1,15 +1,15 @@-package io.onedev.server.web.component.review;+package io.onedev.server.web.component.pullrequest.review;import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;import java.util.List;+import java.util.stream.Collectors;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.web.WebConstants;@@ -31,11 +31,7 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {public void query(String term, int page, Response<User> response) {PullRequest request = requestModel.getObject();List<User> reviewers = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());-- for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null && review.getResult() == null)- reviewers.remove(review.getUser());- }+ reviewers.removeAll(request.getReviews().stream().map(it->it.getUser()).collect(Collectors.toSet()));new ResponseFiller<User>(response).fill(filterAndSort(reviewers, new MatchScoreProvider<User>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/review-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.csssimilarity index 76%rename from server-core/src/main/java/io/onedev/server/web/component/review/review-list.cssrename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.cssindex 4439047d11..59fb76bd68 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/review-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.css@@ -1,17 +1,22 @@-table.reviews a {- color: #333;+table.reviews>tbody>tr>td {+ padding: 6px 12px;}-table.reviews td.result {+table.reviews>tbody>tr>td.result {font-size: 16px;width: 16px;- padding-left: 0;- padding-right: 8px;+ padding-right: 0;}-table.reviews td.user {+table.reviews>tbody>tr>td:first-child {padding-left: 0;}-table.reviews>tbody>tr>td {- padding: 6px 12px;+table.reviews>tbody>tr>td:last-child {+ padding-right: 0;+}+table.reviews>tbody>tr:first-child>td {+ padding-top: 0;+}+table.reviews>tbody>tr:last-child>td {+ padding-bottom: 0;}table.reviews>tbody>tr>td.actions {font-size: 16px;@@ -29,14 +34,6 @@ table.reviews>tbody>tr>td.result span.approved {table.reviews>tbody>tr>td.result span.request-for-changes {color: #F93333;}--table.reviews>tbody>tr:last-child>td {- padding-bottom: 0;- padding-left: 0;-}-table.reviews td.add-reviewer {- padding: 6px 0;-}.review-action {padding: 8px;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 9131225e50..7a226ac1c6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -16,7 +16,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.project.ProjectPicker;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.javaindex 041bbe8045..d0eab0beaa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java@@ -44,7 +44,7 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.InputChangeBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.javaindex 3ec9ba9b93..8b00856980 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex 0048f201e6..8b57c4fc95 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -36,7 +36,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.model.Project;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.javaindex d2c8fa583d..58294377eb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.sideinfo;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;@SuppressWarnings("serial")public class SideInfoLink extends AjaxLink<Void> {@@ -18,19 +17,8 @@ public class SideInfoLink extends AjaxLink<Void> {setOutputMarkupId(true);}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof SideInfoClosed) {- SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();- moreInfoSideClosed.getHandler().appendJavaScript(- String.format("$('#%s').show();", getMarkupId()));- }- }-@Overridepublic void onClick(AjaxRequestTarget target) {- target.appendJavaScript(String.format("$('#%s').hide();", getMarkupId()));send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.javaindex 476b024d12..bca83a1975 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/PersonCardPanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.user.card;import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -45,16 +44,13 @@ public class PersonCardPanel extends Panel {if (personIdent.getName().equals(OneDev.NAME))builder.append("<i>System Account</i>");else- builder.append("<i>No Email Address</i>");+ builder.append("<i>No OneDev Account</i>");} else {User user = OneDev.getInstance(UserManager.class).findByEmail(personIdent.getEmailAddress());if (user != null)- builder.append("<div>" + HtmlEscape.escapeHtml5(user.getName()) + " <i>(Account in OneDev)</i>");+ builder.append("<i>@" + HtmlEscape.escapeHtml5(user.getName()) + "</i>");elsebuilder.append("<i>No OneDev Account</i>");- builder.append("<div><a href='mailto:" + personIdent.getEmailAddress() + "'>"- + HtmlEscape.escapeHtml5(personIdent.getEmailAddress()) + "</a></div>");- container.add(AttributeAppender.append("class", "bigger"));}container.add(new Label("info", builder.toString()).setEscapeModelStrings(false));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.javaindex 2ac7aa642e..d5e619e8e8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/UserCardPanel.java@@ -45,8 +45,7 @@ public class UserCardPanel extends Panel {builder.append("<i>System Account</i>");} else {User user = OneDev.getInstance(UserManager.class).load(userId);- builder.append("<div><a href='mailto:" + user.getEmail() + "'>"- + HtmlEscape.escapeHtml5(user.getEmail()) + "</a></div>");+ builder.append("<i>@" + HtmlEscape.escapeHtml5(user.getName()) + "</i>");}container.add(new Label("info", builder.toString()).setEscapeModelStrings(false));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/card.css b/server-core/src/main/java/io/onedev/server/web/component/user/card/card.cssindex 011bf75326..07f8cbdd43 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/card/card.css+++ b/server-core/src/main/java/io/onedev/server/web/component/user/card/card.css@@ -7,19 +7,13 @@.user-card>.info {padding: 8px 12px 12px 80px;}-.user-card.bigger>.info {- padding-left: 104px;-}.user-card img {position: absolute;width: 64px;height: 64px;}-.user-card.bigger img {- width: 90px;- height: 90px;-}.user-card i {color: #888;font-size: 14px;+ font-style: normal;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex 0208b7f71d..275a949fea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -13,7 +13,7 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex 8415a92841..11dd14415b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -15,9 +15,9 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.javaindex 28d29e1d9c..cc32b561c8 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java@@ -21,7 +21,7 @@ import org.eclipse.jgit.archive.ZipFormat;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class ArchiveDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.javaindex 7f5febd447..365fff49e6 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java@@ -28,8 +28,8 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ContentDetector;-import io.onedev.server.util.SecurityUtils;public class ArtifactDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.javaindex 6c3ed30cea..191966a7fc 100644--- a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java@@ -17,8 +17,8 @@ import org.apache.wicket.request.resource.AbstractResource;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageManager;-import io.onedev.server.util.SecurityUtils;public class AttachmentDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.javaindex 835d554c19..5aa7eba6be 100644--- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java@@ -21,7 +21,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class BuildLogDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javaindex 418229e982..be65327a53 100644--- a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java@@ -25,7 +25,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class RawBlobDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.javaindex 4ea89f3e45..d89f4594a6 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java@@ -16,7 +16,7 @@ import com.google.common.base.Joiner;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;public class ServerLogDownloadResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.javanew file mode 100644index 0000000000..77edea34c0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java@@ -0,0 +1,75 @@+package io.onedev.server.web.editable;++import java.lang.reflect.Method;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.Project;+import io.onedev.server.web.behavior.ReferenceInputBehavior;+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;+import io.onedev.server.web.editable.annotation.ReferenceAware;+import io.onedev.server.web.editable.string.StringPropertyEditor;++@SuppressWarnings("serial")+public class ReferenceAwareEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ if (propertyGetter.getAnnotation(ReferenceAware.class) != null) {+ if (propertyGetter.getReturnType() != String.class) {+ throw new RuntimeException("Annotation 'ReferenceAware' should be applied to property "+ + "with type 'String'");+ }+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ String query = model.getObject();+ if (query != null) {+ return new Label(id, query);+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new StringPropertyEditor(componentId, descriptor, model) {++ @Override+ protected InputAssistBehavior getInputAssistBehavior() {+ return new ReferenceInputBehavior(true) {++ @Override+ protected Project getProject() {+ return Project.get();+ }++ };+ }++ };+ }++ };+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.javaindex be5154643f..28d36d856d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java@@ -7,7 +7,7 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.component.review.ReviewRequirementBehavior;+import io.onedev.server.web.component.pullrequest.review.ReviewRequirementBehavior;import io.onedev.server.web.editable.annotation.ReviewRequirement;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReferenceAware.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReferenceAware.javanew file mode 100644index 0000000000..bea98ab372--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReferenceAware.java@@ -0,0 +1,11 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface ReferenceAware {+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex ae32172296..d1f05c0044 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.util.script.identity.SiteAdministrator;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex 9391eebf6f..63fccc9764 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -35,7 +35,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex a5a5377657..d94f5d8077 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -19,7 +19,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.javaindex 3edd068a6a..a59e5cd879 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/create/NewGroupPage.java@@ -9,9 +9,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.javaindex 29d88bf001..a7920a0c65 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java@@ -38,7 +38,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Membership;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.web.WebConstants;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.javaindex ad4a0b89c2..8e6296c61e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java@@ -13,8 +13,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.notification.MailManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.JobLogger;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.javaindex a515b6a59d..8ca607d9ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/NewRolePage.java@@ -9,9 +9,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.model.Role;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.htmlindex efecef525c..f3035e28d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html@@ -2,7 +2,7 @@<div class="page-title">Role Detail</div><div wicket:id="content" id="role"></div><wicket:fragment wicket:id="ownerFrag">- <div class="alert alert-info"><b>Owner</b> is a built-in role with full permission over projects</div>+ <div class="alert alert-info"><b>Project Owner</b> is a built-in role with full permission over projects</div></wicket:fragment><wicket:fragment wicket:id="nonOwnerFrag"><form wicket:id="form" class="leave-confirm">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.javaindex 3235a168f9..4a2bba5eae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -19,9 +19,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.model.Role;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javaindex aebb4fe96a..fed33571de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -36,7 +36,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.model.Role;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 916ce1b515..ae502f67fe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -42,7 +42,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;@@ -51,7 +51,7 @@ import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.link.ActionablePageLink;-import io.onedev.server.web.component.modal.confirm.ConfirmModal;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;@@ -284,7 +284,7 @@ public class UserListPage extends AdministrationPage {};} else {- new ConfirmModal(target) {+ new ConfirmModalPanel(target) {@Overrideprotected void onConfirm(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex a45bf900be..afa2db88ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -46,7 +46,7 @@ import com.google.common.base.Splitter;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.page.init.ServerInitPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex a08f559ec3..ca2a619cac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -22,7 +22,7 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.model.support.build.NamedBuildQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.javaindex bcb5a99037..fa7b4cbbc6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java@@ -15,7 +15,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.init.InitStage;import io.onedev.server.util.init.ManualConfig;import io.onedev.server.util.init.Skippable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javaindex be8dd45eb0..78e2e5f9fe 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java@@ -22,7 +22,7 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 04776c11ff..49a9a79209 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -20,7 +20,7 @@ import io.onedev.commons.launcher.loader.Plugin;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 8a349afe5b..d138074618 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -13,9 +13,9 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.layout.LayoutPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 5b6aa7e782..0f6c71444b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -21,7 +21,7 @@ import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalProjectSetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.list.ProjectListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 2711e9bae2..3c0aa7e66a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -30,7 +30,7 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex dadbe5cf76..42ecd8bac1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -86,7 +86,7 @@ import io.onedev.server.search.code.SearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.htmlindex 14b224d4ba..1f26b16331 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html@@ -4,22 +4,13 @@Commit Your Change</div><div class="body">- <div wicket:id="feedback"></div>- <div wicket:id="changed" class="changed">- <div class="alert alert-warning">Someone has committed since you start editing.- <a onclick="$(this).parent().next().show();">See what changed.</a>- </div>- <div wicket:id="changes" class="changes"></div>- </div><form wicket:id="form">- <div class="form-group">- <label>Commit Summary</label>- <input wicket:id="commitSummary" class="commit-summary form-control">- </div>- <div class="form-group">- <label>Commit Detail</label>- <textarea wicket:id="commitDetail" class="commit-detail form-control" rows="5"></textarea>+ <div wicket:id="feedback"></div>+ <div wicket:id="changed" class="changed">+ <div class="alert alert-warning">Someone made below change since you started editing</div>+ <div wicket:id="changes" class="changes"></div></div>+ <div wicket:id="commitMessage" class="no-autosize"></div><div class="actions"><input wicket:id="save" type="submit" class="btn btn-primary" value="Commit"><input wicket:id="cancel" type="button" class="btn btn-default" value="Cancel">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 858685ac3e..f179178380 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -22,12 +22,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.FeedbackPanel;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.eclipse.jgit.diff.DiffEntry;import org.eclipse.jgit.lib.FileMode;@@ -55,19 +51,20 @@ import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Provider;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;-import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.diff.blob.BlobDiffPanel;import io.onedev.server.web.component.diff.revision.DiffViewMode;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.blob.RevisionResolved;import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;+import io.onedev.server.web.util.CommitMessageBean;@SuppressWarnings("serial")public abstract class CommitOptionPanel extends Panel {@@ -76,9 +73,7 @@ public abstract class CommitOptionPanel extends Panel {private final Provider<byte[]> newContentProvider;- private String commitSummary;-- private String commitDetail;+ private CommitMessageBean commitMessageBean = new CommitMessageBean();private BlobChange change;@@ -86,6 +81,8 @@ public abstract class CommitOptionPanel extends Panel {private Set<String> oldPaths;+ private Form<?> form;+private final String autosaveKey;public CommitOptionPanel(String id, BlobRenderContext context, @Nullable Provider<byte[]> newContentProvider) {@@ -146,7 +143,6 @@ public abstract class CommitOptionPanel extends Panel {private void newChangedContainer(@Nullable AjaxRequestTarget target) {WebMarkupContainer changedContainer = new WebMarkupContainer("changed");changedContainer.setVisible(change != null);- changedContainer.setOutputMarkupPlaceholderTag(true);if (change != null) {changedContainer.add(new BlobDiffPanel("changes", new AbstractReadOnlyModel<Project>() {@@ -160,15 +156,15 @@ public abstract class CommitOptionPanel extends Panel {changedContainer.add(new WebMarkupContainer("changes"));}if (target != null) {- replace(changedContainer);- target.add(changedContainer);+ form.replace(changedContainer);+ target.add(form);if (change != null) {String script = String.format("$('#%s .commit-option input[type=submit]').val('Commit and overwrite');",getMarkupId());target.appendJavaScript(script);}} else {- add(changedContainer);+ form.add(changedContainer);}}@@ -176,74 +172,22 @@ public abstract class CommitOptionPanel extends Panel {protected void onInitialize() {super.onInitialize();- FeedbackPanel feedback = new NotificationPanel("feedback", this);- feedback.setOutputMarkupPlaceholderTag(true);- add(feedback);-- newChangedContainer(null);-- Form<?> form = new Form<Void>("form");+ form = new Form<Void>("form");+ form.setOutputMarkupId(true);add(form);- form.add(new TextField<String>("commitSummary", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return commitSummary;- }-- @Override- public void setObject(String object) {- commitSummary = object;- }-- }) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.put("placeholder", getDefaultCommitMessage());- }-- }.add(new ReferenceInputBehavior(true) {-- @Override- protected Project getProject() {- return context.getProject();- }-- }));-- form.add(new TextArea<String>("commitDetail", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return commitDetail;- }+ form.add(new NotificationPanel("feedback", form));+ newChangedContainer(null);+ commitMessageBean.setSummary(getDefaultCommitMessage());+ form.add(BeanContext.edit("commitMessage", commitMessageBean));- @Override- public void setObject(String object) {- commitDetail = object;- }-- }).add(new ReferenceInputBehavior(true) {+ AjaxButton saveButton = new AjaxButton("save") {@Override- protected Project getProject() {- return context.getProject();+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);}-- }));-- AjaxButton saveButton = new AjaxButton("save") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -264,7 +208,7 @@ public abstract class CommitOptionPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (save(target, feedback, getPosition())) {+ if (save(target, getPosition())) {String script = String.format(""+ "$('#%s').attr('disabled', 'disabled').val('Please wait...');"+ "onedev.server.form.markClean($('form'));", getMarkupId());@@ -307,19 +251,17 @@ public abstract class CommitOptionPanel extends Panel {|| !Objects.equal(context.getBlobIdent().path, context.getNewPath());}- private boolean save(AjaxRequestTarget target, FeedbackPanel feedback, @Nullable String position) {+ private boolean save(AjaxRequestTarget target, @Nullable String position) {change = null;if (newContentProvider != null && StringUtils.isBlank(context.getNewPath())) {- CommitOptionPanel.this.error("Please specify file name.");- target.add(feedback);+ form.error("Please specify file name.");+ target.add(form);return false;} else {- String commitMessage = commitSummary;- if (StringUtils.isBlank(commitMessage))- commitMessage = getDefaultCommitMessage();- if (StringUtils.isNotBlank(commitDetail))- commitMessage += "\n\n" + commitDetail;+ String commitMessage = commitMessageBean.getSummary();+ if (StringUtils.isNotBlank(commitMessageBean.getBody()))+ commitMessage += "\n\n" + commitMessageBean.getBody();User user = Preconditions.checkNotNull(SecurityUtils.getUser());String revision = context.getBlobIdent().revision;@@ -338,12 +280,12 @@ public abstract class CommitOptionPanel extends Panel {if (newContentProvider != null) {String newPath = context.getNewPath();if (revision != null && context.getProject().isReviewRequiredForModification(user, revision, newPath)) {- CommitOptionPanel.this.error("Review required for this change. Please submit pull request instead");- target.add(feedback);+ form.error("Review required for this change. Please submit pull request instead");+ target.add(form);return false;} else if (revision != null && context.getProject().isBuildRequiredForModification(user, revision, newPath)) {- CommitOptionPanel.this.error("Build required for this change. Please submit pull request instead");- target.add(feedback);+ form.error("Build required for this change. Please submit pull request instead");+ target.add(form);return false;}@@ -370,14 +312,14 @@ public abstract class CommitOptionPanel extends Panel {newCommitId = new BlobEdits(oldPaths, newBlobs).commit(repository, refName,prevCommitId, prevCommitId, user.asPerson(), commitMessage);} catch (ObjectAlreadyExistsException e) {- CommitOptionPanel.this.error("A path with same name already exists. "+ form.error("A path with same name already exists. "+ "Please choose a different name and try again.");- target.add(feedback);+ target.add(form);break;} catch (NotTreeException e) {- CommitOptionPanel.this.error("A file exists where you’re trying to create a subdirectory. "+ form.error("A file exists where you’re trying to create a subdirectory. "+ "Choose a new path and try again..");- target.add(feedback);+ target.add(form);break;} catch (ObsoleteCommitException e) {try (RevWalk revWalk = new RevWalk(repository)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.cssindex de2612be5d..af398163db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css@@ -6,10 +6,15 @@font-size: 16px;margin-bottom: 20px;}-.commit-option>.body>.changed>.changes {+.commit-option>.body .changed>.changes {margin-bottom: 20px;- display: none;}-.commit-option .text-diff>.head>.actions {+.commit-option>.body .text-diff>.head>.actions {+ display: none;+}+.commit-option>.body .text-diff>.head>.actions {display: none;}+.commit-option>.body textarea {+ height: 360px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javaindex 427590d3df..a90fa779da 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java@@ -40,7 +40,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.component.markdown.MarkdownViewer;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex 02f0e60d61..f702083f49 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.ReferenceTransformer;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex d7448ed782..03ce21bc0a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -26,8 +26,8 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ContentDetector;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.javaindex 8728fd11ab..de62f72c4d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.event.RefUpdated;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 90f9a686e0..100fe21c8b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -77,9 +77,9 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.search.code.SearchManager;import io.onedev.server.search.code.hit.QueryHit;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex a18a368445..99e8d94c33 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -26,7 +26,7 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex d892de635e..456710db10 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -72,8 +72,8 @@ import io.onedev.server.model.support.BranchProtection;import io.onedev.server.search.entity.pullrequest.OpenCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;import io.onedev.server.web.component.commit.status.CommitStatusPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 1bd4049030..f30449b9b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -42,8 +42,8 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;@@ -53,7 +53,7 @@ import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.build.side.BuildSidePanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.modal.confirm.ConfirmModal;+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTabLink;@@ -220,7 +220,7 @@ public abstract class BuildDetailPage extends ProjectPage};} else {- new ConfirmModal(target) {+ new ConfirmModalPanel(target) {@Overrideprotected void onConfirm(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.javaindex 3743759ccd..c9dfb12199 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java@@ -16,7 +16,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.javaindex b8984589ff..0b041507c8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.builds.detail.dashboard;import org.apache.wicket.RestartResponseException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.javaindex 40cc1c2f3b..426f88d6eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/log/BuildLogPage.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.build.log.BuildLogPanel;import io.onedev.server.web.download.BuildLogDownloadResource;import io.onedev.server.web.download.BuildLogDownloadResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.javaindex 09a8c2fb03..9a410d04e7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java@@ -14,7 +14,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.ConfirmClickModifier;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.javaindex 180fe868a2..544b6fad69 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java@@ -21,7 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex f0f14540b5..6696280751 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -62,7 +62,7 @@ import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.Mark;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.create.CreateBranchLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex a45b7d0593..65786ee746 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -21,7 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex c6c11a7241..e608db5a72 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -42,9 +42,9 @@ import io.onedev.server.model.support.Mark;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.CommentSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.javaindex 71319afa34..462d12e117 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java@@ -3,7 +3,7 @@ package io.onedev.server.web.page.project.dashboard;import org.apache.wicket.RestartResponseException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex 4362da788b..2c1fd0f092 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -15,9 +15,9 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.blob.ProjectBlobPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex c510eb0562..eefb0a074c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 036b648d60..f0a57592c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -31,7 +31,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneIsEmptyCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex b81f02bdc7..dbe019caaa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -25,8 +25,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateLabel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 5c91cf8f0d..fef9811826 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -55,9 +55,9 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 4aaca7ce91..7c3908121d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -28,7 +28,7 @@ import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.FixedIssueCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.build.list.BuildListPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 38ed9558e2..a6c9234891 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -50,8 +50,8 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.NumberCriteria;import io.onedev.server.search.entity.issue.TitleCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 3dab3f0a18..61fef14b93 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -32,8 +32,8 @@ import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.util.script.identity.SiteAdministrator;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex f7d962eb96..7394341433 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -26,7 +26,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.search.entity.issue.StateCriteria;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.issue.list.IssueListPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 1dcf034327..92ff69b60a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -11,9 +11,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 2b4144084a..dbc711e1fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -41,9 +41,9 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.MilestoneAndState;import io.onedev.server.util.MilestoneSort;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.datatable.DefaultDataTable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 93bb3357e7..efe0c24979 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -10,9 +10,9 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.javaindex 9cbaa2471b..828212b526 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java@@ -16,7 +16,7 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.ConfirmClickModifier;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex d28e85a594..a7a6c82139 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -26,7 +26,7 @@ import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalPullRequestSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.htmlindex 3079e41714..9232cb5837 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html@@ -91,7 +91,18 @@</tr><tr class="reviewers"><td class="name">Reviewers</td>- <td class="value"><div wicket:id="reviewers"></div></td>+ <td class="value">+ <div wicket:id="reviewers"></div>+ <div class="help-block">Pull request can only be merged after getting approvals from all reviewers</div>+ </td>+ </tr>+ <tr class="assignees">+ <td class="name">Assignees</td>+ <td class="value">+ <div wicket:id="assignees"></div>+ <div class="help-block">Assignees have code write permission and will be responsible+ for merging the pull request</div>+ </td></tr></table><div class="clearfix">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex a1e6a4c617..8a44781e82 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -46,10 +46,12 @@ import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;+import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;@@ -61,9 +63,10 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.Pair;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;@@ -75,7 +78,8 @@ import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;-import io.onedev.server.web.component.review.ReviewListPanel;+import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;+import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -225,13 +229,24 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {update.setHeadCommitHash(source.getObjectName());update.setTargetHeadCommitHash(request.getTarget().getObjectName());- OneDev.getInstance(PullRequestManager.class).checkQuality(request);+ OneDev.getInstance(PullRequestManager.class).checkQuality(request, Lists.newArrayList());- if (SecurityUtils.canWriteCode(getProject()) && request.getReviews().isEmpty()) {- PullRequestReview review = new PullRequestReview();- review.setRequest(request);- review.setUser(SecurityUtils.getUser());- request.getReviews().add(review);+ if (SecurityUtils.canWriteCode(target.getProject())) {+ PullRequestAssignment assignment = new PullRequestAssignment();+ assignment.setRequest(request);+ assignment.setUser(SecurityUtils.getUser());+ request.getAssignments().add(assignment);+ } else {+ List<User> codeWriters = new ArrayList<>(+ SecurityUtils.getAuthorizedUsers(target.getProject(), new WriteCode()));+ OneDev.getInstance(CommitInfoManager.class).sortUsersByContribution(+ codeWriters, target.getProject(), update.getChangedFiles());+ if (!codeWriters.isEmpty()) {+ PullRequestAssignment assignment = new PullRequestAssignment();+ assignment.setRequest(request);+ assignment.setUser(codeWriters.iterator().next());+ request.getAssignments().add(assignment);+ }}request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);}@@ -691,8 +706,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {});form.add(newMergeStrategyContainer());-form.add(new ReviewListPanel("reviewers", requestModel));+ form.add(new AssignmentListPanel("assignees", requestModel));return fragment;}@@ -750,7 +765,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {PullRequest request = getPullRequest();MergePreview mergePreview = new MergePreview(request.getTarget().getObjectName(),request.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);- ObjectId merged = mergePreview.getMergeStrategy().merge(request);+ ObjectId merged = mergePreview.getMergeStrategy().merge(request, "Pull request merge preview");if (merged != null)mergePreview.setMergeCommitHash(merged.name());request.setLastMergePreview(mergePreview);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.cssindex d305de7713..2225724509 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css@@ -43,9 +43,15 @@ body.NewPullRequestPage #layout>.body {content: "*";color: red;}-#new-pull-request>.page-content table.reviewers {+#new-pull-request>.page-content table.reviews {width: auto;+ min-width: 250px;}+#new-pull-request>.page-content table.assignments {+ width: auto;+ min-width: 250px;+}+#new-pull-request>.page-content>.status>.can-send form .alert-danger {margin-bottom: 0;margin-top: 16px;@@ -87,7 +93,3 @@ body.NewPullRequestPage #layout>.body {width: 24px;height: 24px;}-#new-pull-request>.page-content>.status>.can-send .merge-strategy .merge-without-review {- margin-top: 20px;- margin-bottom: 0;-}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.htmlindex 654f061973..e01f0b196d 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@@ -25,73 +25,68 @@</div><a wicket:id="moreInfo" class="more-info" title="More info"><span class="fa fa-ellipsis-h"></span></a></div>- <div wicket:id="requestSummary" class="summary">+ <div wicket:id="requestSummary" class="summary resize-aware"><div wicket:id="checkError" class="alert alert-danger"></div>- <div wicket:id="discardedNote" class="discarded alert alert-danger">- <i class="fa fa-exclamation-circle"></i> <b>This pull request has been discarded</b>+ <div wicket:id="discarded" class="discarded alert alert-danger">+ <i class="fa fa-exclamation-circle"></i> This pull request has been discarded</div>- <div wicket:id="mergedNote" class="merged-note alert alert-success">- <div wicket:id="fastForwarded">- <i class="fa fa-check-circle"></i> <b>Target branch was fast-forwarded to source branch</b>- </div>- <div wicket:id="merged">- <i class="fa fa-check-circle"></i> <b>Commits were merged into target branch</b>- </div>- <div wicket:id="mergedOutside">- <i class="fa fa-check-circle"></i> <b>Commits were merged into target branch by someone outside of this pull request</b>- </div>- <div wicket:id="squashed">- <i class="fa fa-check-circle"></i> <b>Commits were squashed into a single commit in target branch</b>- </div>- <div wicket:id="rebased">- <i class="fa fa-check-circle"></i> <b>Commits were rebased onto target branch</b>- </div>+ <div wicket:id="fastForwarded" class="fast-forwarded alert alert-success">+ <i class="fa fa-check-circle"></i> Target branch was fast-forwarded to source branch</div>- <div wicket:id="mergeStatus" class="merge-status">- <div wicket:id="calculating" class="calculating alert alert-warning">- <img src="/img/ajax-indicator-big.gif"> <b>Calculating merge preview...</b>- </div>- <div wicket:id="noConflict" class="no-conflict alert alert-success">- <label><i class="fa fa-check-circle"></i> Able to merge without conflicts</label>- <div>- OneDev will merge automatically after all reviews and builds pass- </div>- </div>- <div wicket:id="conflict" class="conflict alert alert-danger">- <label><i class="fa fa-exclamation-circle"></i> There are merge conflicts</label>- <wicket:enclosure child="resolveInstructions">- <div>- Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts.- </div>- </wicket:enclosure>- </div>+ <div wicket:id="merged" class="merged alert alert-success">+ <i class="fa fa-check-circle"></i> Commits were merged into target branch</div>- <div wicket:id="operations" class="operations">- <div class="buttons">- <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>- <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request for changes</a>- <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>- <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>- <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete source branch</a>- <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore source branch</a>- </div>- <div wicket:id="confirm" class="confirm"></div>+ <div wicket:id="mergedOutside" class="merged-outside alert alert-success">+ <i class="fa fa-check-circle"></i> Commits were merged into target branch by someone outside of this pull request+ </div>+ <div wicket:id="squashed" class="squashed alert alert-success">+ <i class="fa fa-check-circle"></i> Commits were squashed into a single commit on target branch+ </div>+ <div wicket:id="rebased">+ <i class="fa fa-check-circle"></i> Commits were rebased onto target branch+ </div>+ <div wicket:id="calculatingMergePreview" class="calculating-merge-preview alert alert-warning">+ <img src="/img/ajax-indicator-big.gif"> Calculating merge preview...</div>+ <div wicket:id="calculatedMergePreview" class="calculated-merge-preview alert alert-success">+ <i class="fa fa-check-circle"></i> Able to merge without conflicts+ </div>+ <div wicket:id="hasMergeConflict" class="has-merge-conflict alert alert-danger">+ <i class="fa fa-exclamation-circle"></i> There are merge conflicts.+ <wicket:enclosure child="resolveInstructions">+ Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts+ </wicket:enclosure>+ </div>+ <div wicket:id="requestedForChanges" class="requested-for-changes alert alert-danger">+ <i class="fa fa-hande-stop-o"></i> Pull request can not be merged now as <a class="more-info">some reviewers</a> are requesting for changes+ </div>+ <div wicket:id="waitingForReviews" class="waiting-for-reviews alert alert-warning">+ <i class="fa fa-clock-o"></i> Pull request can not be merged now as it is waiting approvals from <a class="more-info">some reviewers</a>+ </div>+ <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds alert alert-danger">+ <i class="fa fa-times-circle"></i> Pull request can not be merged now as <a class="more-info">some required builds</a> are not successful+ </div>+ <div wicket:id="unfinishedBuilds" class="unfinished-builds alert alert-warning">+ <i class="fa fa-clock-o"></i> Pull request can not be merged now as <a class="more-info">some required builds</a> are not finished yet+ </div>+ <div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers alert alert-info">+ <i class="fa fa-info-circle"></i> Pull request can only be merged by users with code write permission+ </div>+ </div>+ <div wicket:id="requestOperations" class="operations">+ <a wicket:id="merge" class="btn btn-sm btn-success">Merge</a>+ <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>+ <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>+ <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request for changes</a>+ <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete source branch</a>+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore source branch</a></div><ul wicket:id="requestTabs" class="tabs nav nav-tabs"></ul><wicket:child></wicket:child></div><div wicket:id="moreInfo"></div></div>- <wicket:fragment wicket:id="operationConfirmFrag">- <div wicket:id="hint" class="hint"></div>- <div wicket:id="feedback"></div>- <form wicket:id="form" class="leave-confirm">- <div wicket:id="note"></div>- <input wicket:id="submit" type="submit" value="Ok" class="btn btn-primary">- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default">- </form>- </wicket:fragment><wicket:fragment wicket:id="codeCommentsTabLinkFrag"><a wicket:id="link" class="code-comments">Code Comments <i class="fa fa-circle"></i></a></wicket:fragment>@@ -99,8 +94,9 @@<div wicket:id="requestNav" class="nav"></div><wicket:enclosure child="reviews"><div class="reviews">- <div class="head">Reviews</div>+ <div class="head">Reviewers</div><div wicket:id="reviews" class="body"></div>+ <div wicket:id="reviewerHelp" class="help-block">Pull request can only be merged after getting approvals from all reviewers</div></div></wicket:enclosure><wicket:enclosure child="jobs">@@ -117,6 +113,13 @@</div></div></wicket:enclosure>+ <wicket:enclosure child="assignments">+ <div class="assignments">+ <div class="head">Assignees</div>+ <div wicket:id="assignments" class="body"></div>+ <div wicket:id="assigneeHelp" class="help-block">Assignees are expected to merge the pull request</div>+ </div>+ </wicket:enclosure><div wicket:id="mergeStrategy" class="merge-strategy"><div class="head">Merge Strategy</div><div class="body">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.javaindex a8f825cabf..720e650f69 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@@ -10,12 +10,6 @@ import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;import static io.onedev.server.util.criteria.Criteria.quote;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DISCARD;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.REOPEN;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.REQUEST_FOR_CHANGES;-import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.RESTORE_SOURCE_BRANCH;import java.util.ArrayList;import java.util.Arrays;@@ -25,19 +19,16 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.stream.Collectors;+import java.util.stream.Stream;import javax.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;-import org.apache.commons.text.WordUtils;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;-import org.apache.wicket.MarkupContainer;import org.apache.wicket.Page;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -51,7 +42,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -69,43 +59,36 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestWatchManager;-import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestVerification;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebSession;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.BranchLink;@@ -116,10 +99,11 @@ import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;-import io.onedev.server.web.component.review.ReviewListPanel;+import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;+import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;@@ -137,33 +121,29 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequimport io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;+import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.CommentableOperationConfirmPanel;+import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.MergeConfirmPanel;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;-import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.PullRequestAware;import io.onedev.server.web.util.ReferenceTransformer;-import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {public static final String PARAM_REQUEST = "request";- private static final String HINT_ID = "hint";-protected final IModel<PullRequest> requestModel;private boolean isEditingTitle;private String title;- private Long reviewUpdateId;+ private Long latestUpdateId;private MergeStrategy mergeStrategy;- private PullRequestOperation activeOperation;-public PullRequestDetailPage(PageParameters params) {super(params);@@ -190,17 +170,14 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRif (!getPullRequest().isValid())throw new RestartResponseException(InvalidPullRequestPage.class, InvalidPullRequestPage.paramsOf(getPullRequest()));- reviewUpdateId = requestModel.getObject().getLatestUpdate().getId();+ latestUpdateId = requestModel.getObject().getLatestUpdate().getId();}private PullRequestManager getPullRequestManager() {return OneDev.getInstance(PullRequestManager.class);}- @Override- protected void onInitialize() {- super.onInitialize();-+ private WebMarkupContainer newRequestHead() {WebMarkupContainer requestHead = new WebMarkupContainer("requestHead");requestHead.setOutputMarkupId(true);add(requestHead);@@ -319,17 +296,25 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- add(newStatusAndBranchesContainer());+ return requestHead;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(newRequestHead());+ add(newStatusAndBranchesContainer());WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {@Override- protected void onBeforeRender() {- super.onBeforeRender();- WicketUtils.markLastVisibleChild(this);+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.pullRequestDetail.onSummaryDomReady();"));}-+};+summaryContainer.add(new WebSocketObserver() {@Override@@ -339,30 +324,12 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic void onObservableChanged(IPartialPageRequestHandler handler) {- for (Component child: summaryContainer) {- if (child instanceof MarkupContainer) {- MarkupContainer container = (MarkupContainer) child;- Form<?> form = container.visitChildren(Form.class, new IVisitor<Form<?>, Form<?>>() {-- @Override- public void component(Form<?> object, IVisit<Form<?>> visit) {- visit.stop(object);- }-- });- if (form == null) {- handler.add(child);- }- } else if (!(child instanceof Form)) {- handler.add(child);- }- }- WicketUtils.markLastVisibleChild(summaryContainer);+ handler.add(component);handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}});- summaryContainer.setOutputMarkupPlaceholderTag(true);+ summaryContainer.setOutputMarkupId(true);add(summaryContainer);summaryContainer.add(new Label("checkError", new AbstractReadOnlyModel<String>() {@@ -380,9 +347,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsetVisible(getPullRequest().getCheckError() != null);}- }.setOutputMarkupPlaceholderTag(true));+ });- summaryContainer.add(new WebMarkupContainer("discardedNote") {+ summaryContainer.add(new WebMarkupContainer("discarded") {@Overrideprotected void onConfigure() {@@ -390,14 +357,215 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsetVisible(getPullRequest().isDiscarded());}- }.setOutputMarkupPlaceholderTag(true));+ });- summaryContainer.add(newMergedNoteContainer());- summaryContainer.add(newMergeStatusContainer());+ summaryContainer.add(new WebMarkupContainer("fastForwarded") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ MergePreview preview = request.getLastMergePreview();+ setVisible(request.isMerged() && preview != null+ && preview.getHeadCommitHash().equals(preview.getMergeCommitHash()));+ }++ });+ summaryContainer.add(new WebMarkupContainer("merged") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ MergePreview preview = request.getLastMergePreview();+ setVisible(request.isMerged() && preview != null+ && (preview.getMergeStrategy() == CREATE_MERGE_COMMIT+ || preview.getMergeStrategy() == CREATE_MERGE_COMMIT_IF_NECESSARY+ && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())));+ }++ });+ summaryContainer.add(new WebMarkupContainer("mergedOutside") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(getPullRequest().isMerged() && getPullRequest().getLastMergePreview() == null);+ }++ });+ summaryContainer.add(new WebMarkupContainer("squashed") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ MergePreview preview = request.getLastMergePreview();+ setVisible(request.isMerged() && preview != null+ && preview.getMergeStrategy() == SQUASH_SOURCE_BRANCH_COMMITS);+ }++ });+ summaryContainer.add(new WebMarkupContainer("rebased") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequest request = getPullRequest();+ MergePreview preview = request.getMergePreview();+ setVisible(request.isMerged() && preview != null+ && preview.getMergeStrategy() == REBASE_SOURCE_BRANCH_COMMITS);+ }++ });- summaryContainer.add(newOperationsContainer());+ summaryContainer.add(new WebMarkupContainer("calculatingMergePreview") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isOpen() && getPullRequest().getMergePreview() == null);+ }++ });+ summaryContainer.add(new WebMarkupContainer("hasMergeConflict") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new DropdownLink("resolveInstructions") {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ dropdown.add(AttributeAppender.append("class", "conflict-resolve-instruction"));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().getSource() != null);+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ if (getPullRequest().getTargetProject().equals(getPullRequest().getSourceProject())) {+ return new ConflictResolveInstructionPanel(id) {++ @Override+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();+ }++ };+ } else {+ return new GitProtocolPanel(id) {++ @Override+ protected Component newContent(String componentId) {+ return new ConflictResolveInstructionPanel(componentId) {++ @Override+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();+ }++ };+ }++ @Override+ protected Project getProject() {+ return getPullRequest().getTargetProject();+ }++ };+ }+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ MergePreview preview = getPullRequest().getMergePreview();+ setVisible(getPullRequest().isOpen() && preview != null+ && preview.getMergeCommitHash() == null);+ }++ });+ summaryContainer.add(new WebMarkupContainer("calculatedMergePreview") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ MergePreview preview = getPullRequest().getMergePreview();+ setVisible(getPullRequest().isOpen() && preview != null+ && preview.getMergeCommitHash() != null);+ }++ });++ summaryContainer.add(new WebMarkupContainer("requestedForChanges") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(requestedForChanges());+ }++ });+ summaryContainer.add(new WebMarkupContainer("waitingForReviews") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(!requestedForChanges()+ && getPullRequest().getReviews().stream().anyMatch(it-> it.getResult()==null));+ }++ });+ summaryContainer.add(new WebMarkupContainer("unsuccessfulBuilds") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(hasUnsuccessfulRequiredBuilds());+ }++ });+ summaryContainer.add(new WebMarkupContainer("unfinishedBuilds") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ Stream<PullRequestVerification> stream = getPullRequest().getVerifications().stream();+ setVisible(!hasUnsuccessfulRequiredBuilds()+ && stream.anyMatch(it-> it.isRequired() && !it.getBuild().isFinished()));+ }++ });+ summaryContainer.add(new WebMarkupContainer("mergeableByCodeWriters") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!SecurityUtils.canWriteCode(getProject())+ && getPullRequest().isAllReviewsApproved()+ && getPullRequest().isRequiredBuildsSuccessful());+ }++ });- WicketUtils.markLastVisibleChild(summaryContainer);+ add(newOperationsContainer());+ add(newMoreInfoContainer());List<Tab> tabs = new ArrayList<>();@@ -459,8 +627,20 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});-- add(new SideInfoPanel("moreInfo") {+ }++ private boolean requestedForChanges() {+ return getPullRequest().getReviews().stream().anyMatch(+ it-> it.getResult()!=null && !it.getResult().isApproved());+ }++ private boolean hasUnsuccessfulRequiredBuilds() {+ return getPullRequest().getVerifications().stream().anyMatch(+ it-> it.isRequired() && it.getBuild().isFinished() && !it.getBuild().isSuccessful());+ }++ private WebMarkupContainer newMoreInfoContainer() {+ return new SideInfoPanel("moreInfo") {@Overrideprotected Component newContent(String componentId) {@@ -504,24 +684,43 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRfragment.add(newMergeStrategyContainer());fragment.add(new ReviewListPanel("reviews", requestModel));+ fragment.add(new WebMarkupContainer("reviewerHelp") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));+ }++ });+ fragment.add(new AssignmentListPanel("assignments", requestModel));+ fragment.add(new WebMarkupContainer("assigneeHelp") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));+ }++ });fragment.add(new ListView<JobBuilds>("jobs", new LoadableDetachableModel<List<JobBuilds>>() {@Overrideprotected List<JobBuilds> load() {PullRequest request = getPullRequest();- Map<String, List<PullRequestBuild>> map = new HashMap<>();- for (PullRequestBuild pullRequestBuild: request.getPullRequestBuilds()) {- String jobName = pullRequestBuild.getBuild().getJobName();- List<PullRequestBuild> list = map.get(jobName);+ Map<String, List<PullRequestVerification>> map = new HashMap<>();+ for (PullRequestVerification verification: request.getVerifications()) {+ String jobName = verification.getBuild().getJobName();+ List<PullRequestVerification> list = map.get(jobName);if (list == null) {list = new ArrayList<>();map.put(jobName, list);}- list.add(pullRequestBuild);+ list.add(verification);}List<JobBuilds> listOfJobBuilds = new ArrayList<>();- for (Map.Entry<String, List<PullRequestBuild>> entry: map.entrySet()) {+ for (Map.Entry<String, List<PullRequestVerification>> entry: map.entrySet()) {List<Build> builds = entry.getValue().stream().map(it->it.getBuild()).collect(Collectors.toList());Collections.sort(builds);listOfJobBuilds.add(new JobBuilds(entry.getKey(), entry.getValue().iterator().next().isRequired(), builds));@@ -650,7 +849,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn fragment;}- });+ };}private WebMarkupContainer newManageContainer() {@@ -839,456 +1038,376 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn statusAndBranchesContainer;}- private WebMarkupContainer newMergeStatusContainer() {- WebMarkupContainer mergeStatusContainer = new WebMarkupContainer("mergeStatus") {+ private WebMarkupContainer newOperationsContainer() {+ WebMarkupContainer operationsContainer = new WebMarkupContainer("requestOperations");+ operationsContainer.add(new WebSocketObserver() {@Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = getPullRequest();- setVisible(request.isOpen());+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));}-- };- mergeStatusContainer.setOutputMarkupPlaceholderTag(true);-- mergeStatusContainer.add(new WebMarkupContainer("calculating") {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().getMergePreview() == null);+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}});- mergeStatusContainer.add(new WebMarkupContainer("conflict") {++ operationsContainer.setOutputMarkupPlaceholderTag(true);++ operationsContainer.setVisible(SecurityUtils.getUser() != null);++ operationsContainer.add(new ModalLink("approve") {++ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }++ private boolean canOperate() {+ PullRequest request = getPullRequest();+ if (request.isOpen()) {+ PullRequestReview review = request.getReview(SecurityUtils.getUser());+ return review == null || review.getResult() == null || !review.getResult().isApproved();+ } else {+ return false;+ }+ }@Override- protected void onInitialize() {- super.onInitialize();-- add(new DropdownLink("resolveInstructions") {+ protected void onConfigure() {+ super.onConfigure();+ setVisible(canOperate());+ }- @Override- protected void onInitialize(FloatingPanel dropdown) {- dropdown.add(AttributeAppender.append("class", "conflict-resolve-instruction"));- }+ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().getSource() != null);- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- if (getPullRequest().getTargetProject().equals(getPullRequest().getSourceProject())) {- return new ConflictResolveInstructionPanel(id) {-- @Override- protected PullRequest getPullRequest() {- return PullRequestDetailPage.this.getPullRequest();- }-- };+ protected boolean operate() {+ if (canOperate()) {+ User user = SecurityUtils.getUser();+ PullRequest request = getPullRequest();+ PullRequestReview review = request.getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ }+ ReviewResult result = new ReviewResult();+ result.setApproved(true);+ result.setComment(getComment());+ result.setCommit(request.getLatestUpdate().getHeadCommitHash());+ review.setResult(result);+ OneDev.getInstance(PullRequestReviewManager.class).review(review);+ Session.get().success("Approved");+ return true;} else {- return new GitProtocolPanel(id) {-- @Override- protected Component newContent(String componentId) {- return new ConflictResolveInstructionPanel(componentId) {-- @Override- protected PullRequest getPullRequest() {- return PullRequestDetailPage.this.getPullRequest();- }-- };- }-- @Override- protected Project getProject() {- return getPullRequest().getTargetProject();- }-- };+ return false;}}- });- }-- @Override- protected void onConfigure() {- super.onConfigure();- MergePreview preview = getPullRequest().getMergePreview();- setVisible(preview != null && preview.getMergeCommitHash() == null);+ @Override+ protected String getTitle() {+ return "Confirm Approve";+ }+ };}-- });- mergeStatusContainer.add(new WebMarkupContainer("noConflict") {- @Override- protected void onConfigure() {- super.onConfigure();- MergePreview preview = getPullRequest().getMergePreview();- setVisible(preview != null && preview.getMergeCommitHash() != null);- }-});- return mergeStatusContainer;- }-- private AttributeAppender newOperationAppender(PullRequestOperation operation) {- return AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ operationsContainer.add(new ModalLink("requestForChanges") {@Override- public String getObject() {- return operation == activeOperation?"active":"";+ protected String getModalCssClass() {+ return "modal-lg";}-- });- }-- private WebMarkupContainer newOperationsContainer() {- WebMarkupContainer operationsContainer = new WebMarkupContainer("operations") {- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasVisibleChildren = false;- for (int i=0; i<size(); i++) {- @SuppressWarnings("deprecation")- Component child = get(i);- child.configure();- if (child.isVisible()) {- hasVisibleChildren = true;- break;- }+ private boolean canOperate() {+ PullRequest request = getPullRequest();+ if (request.isOpen()) {+ PullRequestReview review = request.getReview(SecurityUtils.getUser());+ return review == null || review.getResult() == null || review.getResult().isApproved();+ } else {+ return false;}-- setVisible(hasVisibleChildren);}- };- operationsContainer.setOutputMarkupPlaceholderTag(true);-- String confirmId = "confirm";-- operationsContainer.add(new AjaxLink<Void>("approve") {-- @Override- public void onClick(AjaxRequestTarget target) {- activeOperation = APPROVE;- reviewUpdateId = getPullRequest().getLatestUpdate().getId();- operationsContainer.replace(newOperationConfirm(confirmId, APPROVE, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");- }-@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(APPROVE.canOperate(getPullRequest()));- }-- }.add(newOperationAppender(APPROVE)));-- operationsContainer.add(new AjaxLink<Void>("requestForChanges") {-- @Override- public void onClick(AjaxRequestTarget target) {- activeOperation = REQUEST_FOR_CHANGES;- reviewUpdateId = getPullRequest().getLatestUpdate().getId();- operationsContainer.replace(newOperationConfirm(confirmId, REQUEST_FOR_CHANGES, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ setVisible(canOperate());}@Override- protected void onConfigure() {- super.onConfigure();- setVisible(REQUEST_FOR_CHANGES.canOperate(getPullRequest()));+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ User user = SecurityUtils.getUser();+ PullRequest request = getPullRequest();+ PullRequestReview review = request.getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ }+ ReviewResult result = new ReviewResult();+ result.setApproved(false);+ result.setComment(getComment());+ result.setCommit(request.getLatestUpdate().getHeadCommitHash());+ review.setResult(result);+ OneDev.getInstance(PullRequestReviewManager.class).review(review);+ Session.get().success("Requested For changes");+ return true;+ } else {+ return false;+ }+ }++ @Override+ protected String getTitle() {+ return "Confirm Request For Changes";+ }+ };}- }.add(newOperationAppender(REQUEST_FOR_CHANGES)));+ });- operationsContainer.add(new AjaxLink<Void>("discard") {+ operationsContainer.add(new ModalLink("merge") {- @Override- public void onClick(AjaxRequestTarget target) {- activeOperation = DISCARD;- operationsContainer.replace(newOperationConfirm(confirmId, DISCARD, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ private boolean canOperate() {+ PullRequest request = getPullRequest();+ MergePreview preview = request.getMergePreview();+ return request.isOpen()+ && request.isAllReviewsApproved()+ && request.isRequiredBuildsSuccessful()+ && request.getCheckError() == null+ && preview != null+ && preview.getMergeCommitHash() != null+ && SecurityUtils.canWriteCode(request.getTargetProject());}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(DISCARD.canOperate(getPullRequest()));+ setVisible(canOperate());}- }.add(newOperationAppender(DISCARD)));-- operationsContainer.add(new AjaxLink<Void>("reopen") {-@Override- public void onClick(AjaxRequestTarget target) {- activeOperation = REOPEN;- operationsContainer.replace(newOperationConfirm(confirmId, REOPEN, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ protected Component newContent(String id, ModalPanel modal) {+ return new MergeConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ OneDev.getInstance(PullRequestManager.class).merge(getPullRequest(), getCommitMessage());+ return true;+ } else {+ return false;+ }+ }++ };}- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(REOPEN.canOperate(getPullRequest()));- }-- }.add(newOperationAppender(REOPEN)));+ });- operationsContainer.add(new AjaxLink<Void>("deleteSourceBranch") {+ operationsContainer.add(new ModalLink("discard") {@Override- public void onClick(AjaxRequestTarget target) {- activeOperation = DELETE_SOURCE_BRANCH;- operationsContainer.replace(newOperationConfirm(confirmId, DELETE_SOURCE_BRANCH, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(DELETE_SOURCE_BRANCH.canOperate(getPullRequest()));+ protected String getModalCssClass() {+ return "modal-lg";}- }.add(newOperationAppender(DELETE_SOURCE_BRANCH)));-- operationsContainer.add(new AjaxLink<Void>("restoreSourceBranch") {-- @Override- public void onClick(AjaxRequestTarget target) {- activeOperation = RESTORE_SOURCE_BRANCH;- operationsContainer.replace(newOperationConfirm(confirmId, RESTORE_SOURCE_BRANCH, operationsContainer));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ private boolean canOperate() {+ return getPullRequest().isOpen() && SecurityUtils.canModify(getPullRequest());}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(RESTORE_SOURCE_BRANCH.canOperate(getPullRequest()));+ setVisible(canOperate());}- }.add(newOperationAppender(RESTORE_SOURCE_BRANCH)));-- operationsContainer.add(new WebMarkupContainer(confirmId).setVisible(false));-- return operationsContainer;- }-- private Component newOperationConfirm(String id, PullRequestOperation operation,- WebMarkupContainer operationsContainer) {- PullRequest request = getPullRequest();-- Fragment fragment = new Fragment(id, "operationConfirmFrag", this);- Form<?> form = new Form<Void>("form");- fragment.add(form);-- ProjectAndBranch source = request.getSource();- Preconditions.checkNotNull(source);-- FormComponent<String> noteInput;- form.add(noteInput = new CommentInput("note", Model.of(""), false) {-@Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(requestModel.getObject().getTargetProject(),- requestModel.getObject().getUUID());+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ OneDev.getInstance(PullRequestManager.class).discard(getPullRequest(), getComment());+ return true;+ } else {+ return false;+ }+ }++ @Override+ protected String getTitle() {+ return "Confirm Discard";+ }+ };}++ });++ operationsContainer.add(new ModalLink("reopen") {@Override- protected Project getProject() {- return requestModel.getObject().getTargetProject();+ protected String getModalCssClass() {+ return "modal-lg";}- @Override- protected List<User> getMentionables() {- return OneDev.getInstance(UserManager.class).queryAndSort(getPullRequest().getParticipants());+ private boolean canOperate() {+ PullRequest request = getPullRequest();+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);+ return !request.isOpen()+ && SecurityUtils.canModify(request)+ && request.getTarget().getObjectName(false) != null+ && request.getSourceProject() != null+ && request.getSource().getObjectName(false) != null+ && pullRequestManager.findEffective(request.getTarget(), request.getSource()) == null+ && !GitUtils.isMergedInto(request.getTargetProject().getRepository(), null,+ request.getSource().getObjectId(), request.getTarget().getObjectId());}@Override- protected List<AttributeModifier> getInputModifiers() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a note"));+ protected void onConfigure() {+ super.onConfigure();+ setVisible(canOperate());}-- });-- WebMarkupContainer hint = new WebMarkupContainer(HINT_ID);- hint.setOutputMarkupPlaceholderTag(true);- hint.setVisible(false);- fragment.add(hint);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- fragment.add(feedback);-- form.add(new AjaxButton("submit") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- PullRequest request = getPullRequest();- if ((operation == APPROVE || operation == REQUEST_FOR_CHANGES) &&- !getPullRequest().getLatestUpdate().getId().equals(reviewUpdateId)) {- Long prevReviewUpdateId = reviewUpdateId;- WebMarkupContainer hint = new UnreviewedChangesPanel(HINT_ID,- new LoadableDetachableModel<PullRequestUpdate>() {-- @Override- protected PullRequestUpdate load() {- return OneDev.getInstance(PullRequestUpdateManager.class).load(prevReviewUpdateId);+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ OneDev.getInstance(PullRequestManager.class).reopen(getPullRequest(), getComment());+ return true;+ } else {+ return false;}-- });- hint.setOutputMarkupPlaceholderTag(true);- fragment.replace(hint);+ }- target.add(feedback);- target.add(hint);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");- reviewUpdateId = getPullRequest().getLatestUpdate().getId();- } else if (!operation.canOperate(request)) {- error("Not allowed to " + getOperationName(operation) + " at this point");- target.add(feedback);- target.add(hint);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");- } else {- try {- operation.operate(request, noteInput.getModelObject());- setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest()));- } catch (OneException e) {- error(e.getMessage());- target.add(feedback);- target.add(hint);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ @Override+ protected String getTitle() {+ return "Confirm Reopen";}- }+ };}-+});- form.add(new AjaxLink<Void>("cancel") {++ operationsContainer.add(new ModalLink("deleteSourceBranch") {@Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ protected String getModalCssClass() {+ return "modal-lg";}- @Override- public void onClick(AjaxRequestTarget target) {- activeOperation = null;- fragment.replaceWith(new WebMarkupContainer(id).setVisible(false));- target.add(operationsContainer);- target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");+ private boolean canOperate() {+ PullRequest request = getPullRequest();+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);+ MergePreview preview = request.getLastMergePreview();+ return request.isMerged()+ && request.getSourceProject() != null+ && request.getSource().getObjectName(false) != null+ && !request.getSource().isDefault()+ && preview != null+ && (request.getSource().getObjectName().equals(preview.getHeadCommitHash())+ || request.getSource().getObjectName().equals(preview.getMergeCommitHash()))+ && SecurityUtils.canModify(request)+ && SecurityUtils.canDeleteBranch(request.getSourceProject(), request.getSourceBranch())+ && pullRequestManager.queryOpenTo(request.getSource()).isEmpty();}- });-- return fragment;- }-- private String getOperationName(PullRequestOperation operation) {- return WordUtils.capitalizeFully(operation.name()).replace("_", " ").toLowerCase();- }-- private WebMarkupContainer newMergedNoteContainer() {- WebMarkupContainer mergedNoteContainer = new WebMarkupContainer("mergedNote") {-@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getPullRequest().isMerged());+ setVisible(canOperate());}-- };- mergedNoteContainer.setOutputMarkupPlaceholderTag(true);-- mergedNoteContainer.add(new WebMarkupContainer("fastForwarded") {@Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = getPullRequest();- MergePreview preview = request.getLastMergePreview();- setVisible(preview != null && preview.getHeadCommitHash().equals(preview.getMergeCommitHash()));+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ OneDev.getInstance(PullRequestManager.class).deleteSourceBranch(getPullRequest(), getComment());+ Session.get().success("Deleted source branch");+ return true;+ } else {+ return false;+ }+ }++ @Override+ protected String getTitle() {+ return "Confirm Delete Source Branch";+ }+ };}});- mergedNoteContainer.add(new WebMarkupContainer("merged") {++ operationsContainer.add(new ModalLink("restoreSourceBranch") {@Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = getPullRequest();- MergePreview preview = request.getLastMergePreview();- setVisible(preview != null- && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())- && (preview.getMergeStrategy() == CREATE_MERGE_COMMIT || preview.getMergeStrategy() == CREATE_MERGE_COMMIT_IF_NECESSARY));+ protected String getModalCssClass() {+ return "modal-lg";}-- });- mergedNoteContainer.add(new WebMarkupContainer("mergedOutside") {- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(getPullRequest().getLastMergePreview() == null);+ private boolean canOperate() {+ PullRequest request = getPullRequest();+ return request.getSourceProject() != null+ && request.getSource().getObjectName(false) == null+ && SecurityUtils.canModify(request)+ && SecurityUtils.canWriteCode(request.getSourceProject());}- });- mergedNoteContainer.add(new WebMarkupContainer("squashed") {-@Overrideprotected void onConfigure() {super.onConfigure();-- PullRequest request = getPullRequest();- MergePreview preview = request.getLastMergePreview();- setVisible(preview != null- && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())- && preview.getMergeStrategy() == SQUASH_SOURCE_BRANCH_COMMITS);+ setVisible(canOperate());}-- });- mergedNoteContainer.add(new WebMarkupContainer("rebased") {@Override- protected void onConfigure() {- super.onConfigure();-- PullRequest request = getPullRequest();- MergePreview preview = request.getMergePreview();- setVisible(preview != null- && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())- && preview.getMergeStrategy() == REBASE_SOURCE_BRANCH_COMMITS);+ protected Component newContent(String id, ModalPanel modal) {+ return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {++ @Override+ protected boolean operate() {+ if (canOperate()) {+ OneDev.getInstance(PullRequestManager.class).restoreSourceBranch(getPullRequest(), getComment());+ Session.get().success("Restored source branch");+ return true;+ } else {+ return false;+ }+ }++ @Override+ protected String getTitle() {+ return "Confirm Restore Source Branch";+ }+ };}});- return mergedNoteContainer;+ return operationsContainer;}-+@Overrideprotected void onDetach() {requestModel.detach();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.javadeleted file mode 100644index 8a9f223da3..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java+++ /dev/null@@ -1,158 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.detail;--import javax.annotation.Nullable;--import org.apache.wicket.Session;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.model.support.pullrequest.ReviewResult;-import io.onedev.server.util.SecurityUtils;--public enum PullRequestOperation {- DISCARD {-- @Override- public boolean canOperate(PullRequest request) {- return request.isOpen() && SecurityUtils.canModify(request);- }-- @Override- public void operate(PullRequest request, String comment) {- OneDev.getInstance(PullRequestManager.class).discard(request, comment);- }-- },- APPROVE {-- @Override- public boolean canOperate(PullRequest request) {- if (request.isOpen()) {- PullRequestReview review = request.getReview(SecurityUtils.getUser());- return review != null && review.getExcludeDate() == null- && (review.getResult() == null || !review.getResult().isApproved());- } else {- return false;- }- }-- @Override- public void operate(PullRequest request, String comment) {- User user = SecurityUtils.getUser();- PullRequestReview review = request.getReview(user);- Preconditions.checkState(review != null);- ReviewResult result = new ReviewResult();- result.setApproved(true);- result.setComment(comment);- result.setCommit(request.getLatestUpdate().getHeadCommitHash());- review.setResult(result);- OneDev.getInstance(PullRequestReviewManager.class).review(review);- Session.get().success("Approved");- }-- },- REQUEST_FOR_CHANGES {-- @Override- public boolean canOperate(PullRequest request) {- if (request.isOpen()) {- PullRequestReview review = request.getReview(SecurityUtils.getUser());- return review != null && review.getExcludeDate() == null- && (review.getResult() == null || review.getResult().isApproved());- } else {- return false;- }- }-- @Override- public void operate(PullRequest request, String comment) {- User user = SecurityUtils.getUser();- PullRequestReview review = request.getReview(user);- Preconditions.checkState(review != null);- ReviewResult result = new ReviewResult();- result.setApproved(false);- result.setComment(comment);- result.setCommit(request.getLatestUpdate().getHeadCommitHash());- review.setResult(result);- OneDev.getInstance(PullRequestReviewManager.class).review(review);- Session.get().success("Requested for changes");- }-- },- REOPEN {-- @Override- public boolean canOperate(PullRequest request) {- PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);- return !request.isOpen()- && SecurityUtils.canModify(request)- && request.getTarget().getObjectName(false) != null- && request.getSourceProject() != null- && request.getSource().getObjectName(false) != null- && pullRequestManager.findEffective(request.getTarget(), request.getSource()) == null- && !GitUtils.isMergedInto(request.getTargetProject().getRepository(), null,- request.getSource().getObjectId(), request.getTarget().getObjectId());- }-- @Override- public void operate(PullRequest request, String comment) {- OneDev.getInstance(PullRequestManager.class).reopen(request, comment);- }-- },- DELETE_SOURCE_BRANCH {-- @Override- public void operate(PullRequest request, String comment) {- OneDev.getInstance(PullRequestManager.class).deleteSourceBranch(request, comment);- Session.get().success("Deleted source branch");- }-- @Override- public boolean canOperate(PullRequest request) {- MergePreview preview = request.getLastMergePreview();- PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);- return request.isMerged()- && request.getSourceProject() != null- && request.getSource().getObjectName(false) != null- && !request.getSource().isDefault()- && preview != null- && (request.getSource().getObjectName().equals(preview.getHeadCommitHash())- || request.getSource().getObjectName().equals(preview.getMergeCommitHash()))- && SecurityUtils.canModify(request)- && SecurityUtils.canDeleteBranch(request.getSourceProject(), request.getSourceBranch())- && pullRequestManager.queryOpenTo(request.getSource()).isEmpty();- }-- },- RESTORE_SOURCE_BRANCH {-- @Override- public void operate(PullRequest request, String comment) {- OneDev.getInstance(PullRequestManager.class).restoreSourceBranch(request, comment);- Session.get().success("Restored source branch");- }-- @Override- public boolean canOperate(PullRequest request) {- return request.getSourceProject() != null- && request.getSource().getObjectName(false) == null- && SecurityUtils.canModify(request)- && SecurityUtils.canWriteCode(request.getSourceProject());- }-- };-- public abstract void operate(PullRequest request, @Nullable String comment);-- public abstract boolean canOperate(PullRequest request);--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.javaindex c086d41a04..311347bf65 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java@@ -12,7 +12,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.DiffSupport;import io.onedev.server.web.component.diff.plain.PlainDiffPanel;import io.onedev.server.web.component.markdown.AttachmentSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.javaindex 9df1cc230d..67d2a96e67 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java@@ -15,8 +15,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.project.comment.ProjectCommentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.javaindex c6742445e4..be9a976a2e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java@@ -13,8 +13,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.project.comment.ProjectCommentPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.cssindex 42e5e7b546..d99ba1d2d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css@@ -36,12 +36,16 @@}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {position: relative;- padding: 6px 0;+ margin: 8px 0;+ padding: 4px;+}+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit:hover {+ background: #F7ECB9;}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.author {position: absolute;left: 24px;- top: 6px;+ top: 4px;}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {padding: 0 130px 0 50px;@@ -49,6 +53,11 @@#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.with-status>.message {padding-right: 175px;}+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {+ position: absolute;+ top: 4px;+ right: 4px;+}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit:before {font-family: "FontExt";content: "\f220";@@ -65,11 +74,6 @@#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body {margin: 0;}-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {- position: absolute;- top: 6px;- right: 0;-}#request-detail>.main>.activities .activity>td>.content {padding-top: 8px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.javaindex a3a5939859..311c34b700 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java@@ -16,7 +16,7 @@ import io.onedev.server.OneDev;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.util.PagingHistorySupport;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.htmlindex 691b546369..8d4a776140 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html@@ -19,7 +19,7 @@<a wicket:id="copyMergedCommit" class="btn btn-sm btn-default"><i class="fa fa-clipboard"></i></a></span><span wicket:id="buildStatus" class="build-status"></span>- <div class="description">Merged commit</div>+ <div class="description">Merge preview commit</div></div></div><div wicket:id="outDated" class="out-dated alert alert-warning">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.htmlnew file mode 100644index 0000000000..0504f0898a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="comment"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.javanew file mode 100644index 0000000000..a4d8af7a05--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java@@ -0,0 +1,66 @@+package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;++import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.model.PropertyModel;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.util.ProjectAttachmentSupport;++@SuppressWarnings("serial")+public abstract class CommentableOperationConfirmPanel extends OperationConfirmPanel {++ private String comment;++ public CommentableOperationConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {+ super(componentId, modal, latestUpdateId);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getForm().add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {++ @Override+ protected Project getProject() {+ return getLatestUpdate().getRequest().getTargetProject();+ }++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getLatestUpdate().getRequest().getTargetProject(),+ getLatestUpdate().getRequest().getUUID());+ }++ @Override+ protected List<User> getMentionables() {+ return OneDev.getInstance(UserManager.class)+ .queryAndSort(getLatestUpdate().getRequest().getParticipants());+ }++ @Override+ protected List<AttributeModifier> getInputModifiers() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a note"));+ }++ });+ }++ @Nullable+ protected final String getComment() {+ return comment;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.htmlnew file mode 100644index 0000000000..c7d5569553--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div wicket:id="description" class="alert alert-info"></div>+ <div wicket:id="commitMessage" class="no-autosize commit-message"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.javanew file mode 100644index 0000000000..27c9b3a6d3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java@@ -0,0 +1,100 @@+package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;++import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;++import java.util.List;++import org.apache.wicket.markup.html.basic.Label;+import org.eclipse.jgit.revwalk.RevCommit;++import com.google.common.base.Splitter;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.util.CommitMessageBean;++@SuppressWarnings("serial")+public abstract class MergeConfirmPanel extends OperationConfirmPanel {++ private CommitMessageBean bean = new CommitMessageBean();++ public MergeConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {+ super(componentId, modal, latestUpdateId);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequest request = getPullRequest();+ if (request.getMergeStrategy() == MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS) {+ StringBuilder builder = new StringBuilder();++ for (PullRequestUpdate update: request.getSortedUpdates()) {+ for (RevCommit commit: update.getCommits()) {+ List<String> lines = Splitter.on('\n').splitToList(commit.getFullMessage().trim());+ for (int i=0; i<lines.size(); i++) {+ builder.append(i==0?"- ": " ");+ builder.append(lines.get(i)).append("\n");+ }+ builder.append("\n");+ }+ }++ bean.setBody(builder.toString().trim());+ }++ String description;+ MergeStrategy mergeStrategy = getPullRequest().getMergeStrategy();+ MergePreview mergePreview = getPullRequest().getMergePreview();+ boolean needMergeCommit = false;+ if (mergeStrategy == CREATE_MERGE_COMMIT) {+ bean.setSummary("Merge pull request " + request.describe());+ description = "Specify commit message of the merge commit";+ needMergeCommit = true;+ } else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS) {+ bean.setSummary("Pull request " + request.describe());+ description = "Specify commit message of the squash commit";+ needMergeCommit = true;+ } else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {+ description = "Source branch commits will be rebased onto target branch";+ needMergeCommit = false;+ } else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash())) {+ description = "Source branch commits will be fast-forwarded to target branch";+ needMergeCommit = false;+ } else {+ bean.setSummary("Merge pull request " + request.describe());+ description = "Specify commit message of the merge commit";+ needMergeCommit = true;+ }++ getForm().add(new Label("description", description));++ getForm().add(BeanContext.edit("commitMessage", bean).setVisible(needMergeCommit));+ }++ private PullRequest getPullRequest() {+ return getLatestUpdate().getRequest();+ }++ public String getCommitMessage() {+ StringBuilder builder = new StringBuilder(bean.getSummary());+ if (bean.getBody() != null) {+ builder.append("\n\n");+ builder.append(bean.getBody());+ }+ return builder.toString();+ }++ @Override+ protected String getTitle() {+ return getPullRequest().getMergeStrategy().toString();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.javanew file mode 100644index 0000000000..2973d6c3e0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class OperationConfirmCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public OperationConfirmCssResourceReference() {+ super(OperationConfirmCssResourceReference.class, "operation-confirm.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.htmlnew file mode 100644index 0000000000..d77e7769d7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html@@ -0,0 +1,18 @@+<wicket:panel>+ <div class="pull-request-operation-confirm">+ <form wicket:id="form" class="leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 wicket:id="title" id="modal-title" class="modal-title">Please Confirm</h4>+ </div>+ <div class="modal-body">+ <div wicket:id="feedback"></div>+ <wicket:child></wicket:child>+ </div>+ <div class="modal-footer">+ <input wicket:id="ok" type="submit" class="btn btn-primary" value="Ok">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.javanew file mode 100644index 0000000000..32736a3452--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java@@ -0,0 +1,144 @@+package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FeedbackMessage;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;++@SuppressWarnings("serial")+public abstract class OperationConfirmPanel extends Panel {++ private final ModalPanel modal;++ private Form<?> form;++ private Long latestUpdateId;++ public OperationConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {+ super(componentId);+ this.modal = modal;+ this.latestUpdateId = latestUpdateId;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ add(form);++ form.add(new Label("title", getTitle()));++ form.add(new FencedFeedbackPanel("feedback", form) {++ @Override+ protected Component newMessageDisplayComponent(String id, FeedbackMessage message) {+ return super.newMessageDisplayComponent(id, message).setEscapeModelStrings(false);+ }++ });++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ form.add(new AjaxButton("ok") {++ @Override+ public void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ PullRequestUpdate latestUpdate = getLatestUpdate();+ PullRequest request = latestUpdate.getRequest();+ if (latestUpdate.equals(request.getLatestUpdate())) {+ if (operate()) {+ modal.close();+ } else {+ form.error("Can not perform this operation now");+ target.add(form);+ }+ } else {+ PullRequestChangesPage.State state = new PullRequestChangesPage.State();+ state.oldCommitHash = latestUpdate.getHeadCommitHash();+ state.newCommitHash = request.getLatestUpdate().getHeadCommitHash();++ CharSequence url = RequestCycle.get().urlFor(PullRequestChangesPage.class,+ PullRequestChangesPage.paramsOf(request, state));++ form.warn(String.format("There are <a href='%s'>new changes</a> in this pull request", url));++ target.add(form);+ latestUpdateId = request.getLatestUpdate().getId();+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new OperationConfirmCssResourceReference()));+ }++ protected abstract boolean operate();++ protected final Form<?> getForm() {+ return form;+ }++ protected final PullRequestUpdate getLatestUpdate() {+ return OneDev.getInstance(PullRequestUpdateManager.class).load(latestUpdateId);+ }++ protected abstract String getTitle();++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.cssnew file mode 100644index 0000000000..71606f7646--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/operation-confirm.css@@ -0,0 +1,3 @@+.pull-request-operation-confirm .commit-message textarea {+ height: 360px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex e921eb93c1..44f2d39fb6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -82,43 +82,36 @@ body.PullRequestDetailPage #layout>.body {transform: rotate(-90deg);}-#request-detail>.main>.summary>div {- margin-bottom: 20px;-}-#request-detail>.main>.summary ul {+#request-detail>.main>.summary .alert {margin-bottom: 0;+ border-radius: 0;+ border-bottom: 1px dotted #888;+}+#request-detail>.main>.summary>.alert:first-child {+ border-radius: 4px 4px 0 0;+}+#request-detail>.main>.summary>.alert:last-child {+ border-radius: 0 0 4px 4px;+ border-bottom: none;}-#request-detail>.main>.summary .calculating img {+#request-detail>.main>.summary>.alert:first-child:last-child {+ border-radius: 4px;+}++#request-detail>.main>.summary>.calculating-merge-preview img {width: 24px;height: 24px;}--#request-detail>.main>.summary .no-conflict>* {- margin-right: 4px;+#request-detail>.main>.summary .more-info.not-link {+ color: inherit;+ cursor: inherit;}-#request-detail>.main>.summary>.operations>.confirm {- margin-top: 12px;+#request-detail>.main>.summary .more-info.not-link:hover {+ text-decoration: inherit;}-#request-detail>.main>.summary>.operations>.confirm>.hint {- margin-bottom: 12px;- font-size: 16px;-}-#request-detail>.main>.summary>.operations>.confirm>.hint .warning {- color: #EC5544;-}-#request-detail>.main>.summary>.operations>.buttons>a,-#request-detail>.main>.summary>.operations>.confirm>form>input {- margin-right: 8px;-}-#request-detail>.main>.summary>.operations>.buttons>.btn-primary.active {- background-color: #204C72;-}-#request-detail>.main>.summary>.operations>.buttons>.btn-danger.active {- background-color: #A62924;-}-#request-detail>.main>.summary>.operations>.confirm>form .markdown-editor {- margin-bottom: 16px;+#request-detail>.main>.operations>a {+ margin-right: 8px;}ul>li>a.code-comments .fa-circle {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.jsindex 4fdd4f41cb..aa2c831e37 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js@@ -10,5 +10,23 @@ onedev.server.pullRequestDetail = {$main.scroll(function() {$main.find(".scroll-aware").addBack(".scroll-aware").trigger("scrolled");});+ },+ onSummaryDomReady: function() {+ var $summary = $("#request-detail>.main>.summary");++ $summary.find(".more-info").click(function() {+ $("#request-detail>.main>.status-and-branches .more-info").trigger("click");+ });++ function modifyMoreInfoLink() {+ $summary.find(".more-info").each(function() {+ if ($("#request-detail>.main>.status-and-branches .more-info").is(":visible"))+ $(this).removeClass("not-link");+ else+ $(this).addClass("not-link");+ });+ }+ modifyMoreInfoLink();+ $summary.on("resized", modifyMoreInfoLink);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex 7b1788b554..814654b910 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 93fecb5917..4a74d9169e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -19,7 +19,7 @@ import io.onedev.server.model.Membership;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex ee0210e295..0600d7755d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;import io.onedev.server.git.Contribution;import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Day;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.user.card.PersonCardPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.javaindex 00b27b5825..f02e1cd21c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javaindex 571e590040..3fa9e5345b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java@@ -18,8 +18,8 @@ import io.onedev.server.git.Contributor;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Day;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.avatar.AvatarManager;class TopContributorsResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 12f2408492..41824d02a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -53,7 +53,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.OnTypingDoneBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javaindex 3d5720347e..0b65f161e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java@@ -24,7 +24,7 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalPullRequestSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex 1109ad8c22..a72b090115 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -13,9 +13,9 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.base.BasePage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 2dbbd9b89d..09804db865 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -26,7 +26,6 @@ public class TestPage extends BasePage {}});-}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.javanew file mode 100644index 0000000000..f82d01e8db--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java@@ -0,0 +1,45 @@+package io.onedev.server.web.util;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.ReferenceAware;++@Editable+public class CommitMessageBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String summary;++ private String body;++ @Editable(order=100, name="Commit Message Summary")+ @NotEmpty+ @OmitName+ @ReferenceAware+ public String getSummary() {+ return summary;+ }++ public void setSummary(String summary) {+ this.summary = summary;+ }++ @Editable(order=200, name="Commit Message Body")+ @Multiline+ @OmitName+ @ReferenceAware+ public String getBody() {+ return body;+ }++ public void setBody(String body) {+ this.body = body;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.javaindex e1eb86e75c..4eac2bfe09 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java@@ -19,8 +19,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageManager;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.download.AttachmentDownloadResource;import io.onedev.server.web.download.AttachmentDownloadResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 27fcef30d2..fa1086455d 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -50,8 +50,8 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.match.PatternApplied;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.script.ScriptContribution;diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex 01317676d8..7a29f7f6a1 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.behavior.Behavior;import org.apache.wicket.core.request.handler.IPageRequestHandler;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.protocol.ws.api.registry.PageIdKey;@@ -97,22 +96,6 @@ public class WicketUtils {|| userAgent.indexOf("windows phone") != -1;}- public static void markLastVisibleChild(WebMarkupContainer container) {- Component lastVisible = null;- for (Component child: container) {- for (Behavior behavior: child.getBehaviors()) {- if (behavior instanceof LastVisibleAppender) {- child.remove(behavior);- }- }- child.configure();- if (child.isVisible())- lastVisible = child;- }- if (lastVisible != null)- lastVisible.add(new LastVisibleAppender("class", "last-visible").setSeparator(" "));- }-public static int getChildIndex(WebMarkupContainer parent, Component child) {int index = 0;for (Component each: parent) {diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.javaindex f26d29117f..278d5d7583 100644--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java@@ -124,13 +124,13 @@ public abstract class AbstractGitTest extends AppLoaderMocker {}}- protected void commit(String comment) {+ protected String commit(String comment) {CommitCommand ci = git.commit();ci.setMessage(comment);ci.setAuthor(user);ci.setCommitter(user);try {- ci.call();+ return ci.call().name();} catch (GitAPIException e) {throw new RuntimeException(e);}@@ -141,14 +141,14 @@ public abstract class AbstractGitTest extends AppLoaderMocker {add(path);}- protected void addFileAndCommit(String path, String content, String comment) {+ protected String addFileAndCommit(String path, String content, String comment) {addFile(path, content);- commit(comment);+ return commit(comment);}- protected void removeFileAndCommit(String path, String comment) {+ protected String removeFileAndCommit(String path, String comment) {rm(path);- commit(comment);+ return commit(comment);}protected void updateRef(String refName, String newValue, @Nullable String oldValue) {diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.javaindex 97f75fee4f..9dc69ade06 100644--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java@@ -64,6 +64,20 @@ public class GitUtilsTest extends AbstractGitTest {}}+ @Test+ public void testRebaseWithoutChange() throws Exception {+ addFileAndCommit("initial", "", "initial");+ git.checkout().setCreateBranch(true).setName("dev").call();+ String commitHash1 = addFileAndCommit("dev1", "", "dev1");+ String commitHash2 = addFileAndCommit("dev2", "", "dev2");+ ObjectId masterId = git.getRepository().resolve("master");+ ObjectId newCommitId = GitUtils.rebase(git.getRepository(), git.getRepository().resolve("dev"), masterId, user);+ try ( RevWalk revWalk = new RevWalk(git.getRepository())) {+ assertEquals(commitHash2, newCommitId.name());+ assertEquals(commitHash1, revWalk.parseCommit(newCommitId).getParent(0).name());+ }+ }+@Testpublic void testRebaseWithConflicts() throws Exception {addFileAndCommit("initial", "", "initial");diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.javaindex ee775d6af9..67ad6a39e8 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java@@ -29,8 +29,8 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.SecurityUtils;public class HtmlReportDownloadResource extends AbstractResource {diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.javaindex d2db292f48..70d2e8e196 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java@@ -15,7 +15,7 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.buildspec.job.JobReport;import io.onedev.server.model.Build;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.mapper.OneResourceMapper;diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.javaindex 86e7ac13ee..73f4bd7a7f 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java@@ -17,7 +17,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.model.Build;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;@SuppressWarnings("serial")