The Unified and Autonomous Development Platform
Add some help
Robin Shen3a264f329ab8
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex 8a63554148..e21f3821cd 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -433,25 +433,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestReviewManager.saveReviews(request);pullRequestBuildManager.saveBuilds(request);- boolean allReviewsApproved = true;- for (PullRequestReview review: request.getReviews()) {- if (review.getExcludeDate() == null &&- (review.getResult() == null || !review.getResult().isApproved())) {- allReviewsApproved = false;- break;- }- }- boolean allBuildsSuccessful = true;- for (PullRequestBuild build: request.getBuilds()) {- if (build.getBuild() == null || build.getBuild().getStatus() != Build.Status.SUCCESS) {- allBuildsSuccessful = false;- break;- }- }-MergePreview mergePreview = request.getMergePreview();- if (allReviewsApproved && allBuildsSuccessful+ if (request.isAllReviewsApproved() && request.isAllBuildsSuccessful()&& mergePreview != null && mergePreview.getMerged() != null) {merge(request);}diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 5f48a84280..c711776a4b 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -809,6 +809,25 @@ public class PullRequest extends AbstractEntity implements Referenceable {return fixedIssues;}+ public boolean isAllReviewsApproved() {+ for (PullRequestReview review: getReviews()) {+ if (review.getExcludeDate() == null &&+ (review.getResult() == null || !review.getResult().isApproved())) {+ return false;+ }+ }+ return true;+ }++ public boolean isAllBuildsSuccessful() {+ for (PullRequestBuild build: getBuilds()) {+ if (build.getBuild() == null || build.getBuild().getStatus() != Build.Status.SUCCESS) {+ return false;+ }+ }+ return true;+ }+public static class ComparingInfo implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.javaindex 2387e1091a..c2746f2048 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-@Editable(order=100, name="has value of")+@Editable(order=100, name="has any value of")public class ValueIsOneOf implements ValueMatcher {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javaindex 94acc530f8..44b58a835b 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java@@ -31,7 +31,6 @@ public class ShowCondition implements Serializable {@Editable(order=100, name="resource.input.input")@ChoiceProvider("getNameChoices")@NotEmpty- @OmitNamepublic String getInputName() {return inputName;}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javaindex 069ed67fdc..3db7488b17 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-@Editable(order=100, name="has value of")+@Editable(order=100, name="has any value of")public class ValueIsOneOf implements ValueMatcher {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 6a7957233f..7335545b24 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -17,6 +17,7 @@<div class="body"><div wicket:id="feedback"></div><table wicket:id="builds" class="table"></table>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists builds containig recent commits fixing the issue</div></div></div><wicket:fragment wicket:id="versionFrag">diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 50608f347d..27733a21cd 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -295,7 +295,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {@Overridepublic String getCssClass() {- return "commit";+ return "commit expanded";}@Override@@ -319,7 +319,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {@Overridepublic String getCssClass() {- return "date";+ return "date expanded";}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css b/core/src/main/java/io/onedev/server/web/component/build/list/build-list.cssindex 974cb2b2b9..bca8411950 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css+++ b/core/src/main/java/io/onedev/server/web/component/build/list/build-list.css@@ -1,3 +1,8 @@+@media(max-width: 767px) {+ .build-list .expanded {+ display: none;+ }+}.build-list>.head {position: relative;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.htmlindex 74db98eb19..a6303583e6 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html@@ -1,8 +1,8 @@<wicket:panel><table wicket:id="requests" class="table issue-pull-requests"></table>- <wicket:fragment wicket:id="titleFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>+ <div class="help-block">+ <i class="fa fa-info-circle"></i> This page lists pull requests containing recent commits fixing the issue+ </div><wicket:fragment wicket:id="sourceFrag"><a wicket:id="link"></a></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.javaindex d4720ceb34..ead8d20df9 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java@@ -18,8 +18,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvidimport 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.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;@@ -34,10 +32,10 @@ import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;+import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;@SuppressWarnings("serial")public abstract class IssuePullRequestsPanel extends Panel {@@ -89,36 +87,16 @@ public abstract class IssuePullRequestsPanel extends Panel {List<IColumn<PullRequest, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("#")) {+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {@Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,- IModel<PullRequest> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getNumber()));- }- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Title")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,- IModel<PullRequest> rowModel) {- Fragment fragment = new Fragment(componentId, "titleFrag", IssuePullRequestsPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,- PullRequestActivitiesPage.paramsOf(rowModel.getObject(), null));- link.add(new Label("label", rowModel.getObject().getTitle()));- fragment.add(link);-- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("State")) {+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new PullRequestSummaryPanel(componentId, rowModel));+ }@Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,- IModel<PullRequest> rowModel) {- cellItem.add(new RequestStatusLabel(componentId, rowModel));+ public String getCssClass() {+ return "summary";}});@@ -138,11 +116,26 @@ public abstract class IssuePullRequestsPanel extends Panel {@Overridepublic String getCssClass() {- return "expanded";+ return "source expanded";}});+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ PullRequest request = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));+ }++ @Override+ public String getCssClass() {+ return "last-update expanded";+ }++ });+SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.cssindex b718a390f1..8229f37f7b 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css@@ -1,5 +1,5 @@@media(max-width: 991px) {- .issue-pull-requests th.expanded, .issue-pull-requests td.expanded {+ .issue-pull-requests thead, .issue-pull-requests td.expanded {display: none;}}diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.javanew file mode 100644index 0000000000..512d685f2e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.pullrequest.summary;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class PullRequestSummaryCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public PullRequestSummaryCssResourceReference() {+ super(PullRequestSummaryCssResourceReference.class, "pull-request-summary.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.html b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.htmlnew file mode 100644index 0000000000..e759d5076b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <div class="pull-request-summary">+ <div class="first-line">+ <a wicket:id="title" class="title"><span wicket:id="label"></span></a>+ <span wicket:id="number" class="number"></span>+ </div>+ <div class="second-line clearfix">+ <div wicket:id="status" class="status pull-left"></div>+ <div class="submission pull-left">+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>+ </div>+ <div class="comments pull-left" title="Comments">+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>+ </div>+ </div>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.javanew file mode 100644index 0000000000..2cf246aed7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java@@ -0,0 +1,59 @@+package io.onedev.server.web.component.pullrequest.summary;++import javax.annotation.Nullable;++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.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.PullRequest;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.util.QueryPosition;++@SuppressWarnings("serial")+public class PullRequestSummaryPanel extends GenericPanel<PullRequest> {++ public PullRequestSummaryPanel(String id, IModel<PullRequest> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequest request = getModelObject();++ add(new Label("number", "#" + request.getNumber()));+ Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(request, getQueryPosition()));+ link.add(new Label("label", request.getTitle()));+ add(link);+ add(new RequestStatusLabel("status", getModel()));+ UserIdent submitterIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());+ add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));+ add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));+ add(new Label("comments", request.getCommentCount()));+ }++ @Nullable+ protected QueryPosition getQueryPosition() {+ return null;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PullRequestSummaryCssResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.css b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.cssnew file mode 100644index 0000000000..cbcffc3c6f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.css@@ -0,0 +1,22 @@+.pull-request-summary>.first-line {+ margin-bottom: 8px;+ font-weight: bold;+ font-size: 16px;+}+.pull-request-summary>.first-line>.title {+ margin-right: 8px;+ color: #444;+}+.pull-request-summary>.second-line>* {+ margin-right: 12px;+}+.pull-request-summary>.second-line>*:last-child {+ margin-right: 0;+}+.pull-request-summary>.second-line>.status {+ width: 75px;+ padding: 6px 8px;+}+.pull-request-summary>.second-line {+ color: #888;+}diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.jsindex 533f44c5df..55c3bf1e79 100644--- a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js@@ -28,13 +28,14 @@ onedev.server.sidebar = {}$miniToggle.click(function() {- $sidebar.toggleClass("minimized", 100);- if (miniCookieKey) {- var cookieValue = $sidebar.hasClass("minimized")?"yes":"no";- Cookies.set(miniCookieKey, cookieValue, {expires: Infinity});- }- onMiniToggled();- $(window).resize();+ $sidebar.toggleClass("minimized", 100, function() {+ if (miniCookieKey) {+ var cookieValue = $sidebar.hasClass("minimized")?"yes":"no";+ Cookies.set(miniCookieKey, cookieValue, {expires: Infinity});+ }+ onMiniToggled();+ $(window).resize();+ });});onMiniToggled();diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.propertiesindex 45b3dddd15..ae86adf5c0 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties@@ -1,4 +1,4 @@-resource.input.input=Field+resource.input.input=When fieldresource.input.description=Optionally describes the custom fieldresource.input.showCondition=Enable if visibility of this field depends on other fieldsresource.input.allowEmpty=Whether or not this field accepts empty valuediff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.cssindex af85b29ce4..73b3d72767 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css@@ -1,5 +1,5 @@-.floating.field-spec td.name {- min-width: 150px !important;+.floating.field-spec>.content>.body>div>.bean.viewer>.properties>table>tbody>tr>td.name {+ min-width: 150px;}.floating.field-spec .property-showCondition .property-inputName td.name,@@ -9,9 +9,10 @@text-align: left;}-.field-spec-edit .property-showCondition>.value label,-.field-spec-edit .property-choicesProvider>.value label.name,-.field-spec-edit .property-choicesProvider>.value .bean.list thead th,+.field-spec .property-showCondition .property-inputName td.name,+.field-spec-edit .property-showCondition .property-inputName label.name,+.field-spec-edit .property-choiceProvider>.value label.name,+.field-spec-edit .property-choiceProvider>.value .bean.list thead th,.field-spec-edit .property-nameOfEmptyValue .control-label {font-weight: normal;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.htmlindex 7bb8556336..ae7fed5f09 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html@@ -13,4 +13,8 @@<div wicket:id="moreInfo"></div></div></div>+ <wicket:fragment wicket:id="commitsFrag">+ <div wicket:id="commits" class="commits"></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists recent commits fixing the issue</div>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex ffd03f2c76..f3af8efc6c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -12,6 +12,7 @@ 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.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;@@ -145,7 +146,8 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new CommitListPanel(TAB_CONTENT_ID, new AbstractReadOnlyModel<Project>() {+ Fragment fragment = new Fragment(TAB_CONTENT_ID, "commitsFrag", CardDetailPanel.this);+ fragment.add(new CommitListPanel("commits", new AbstractReadOnlyModel<Project>() {@Overridepublic Project getObject() {@@ -159,9 +161,10 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContereturn getIssue().getCommits();}- }).setOutputMarkupId(true);- CardDetailPanel.this.replace(content);- target.add(content);+ }));+ fragment.setOutputMarkupId(true);+ CardDetailPanel.this.replace(fragment);+ target.add(fragment);}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex a7492c570b..1d24234c4c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -194,6 +194,9 @@.board-card-detail>.body>.main>div:last-child {margin-bottom: 0;}+.board-card-detail>.body>.main .commits {+ margin-bottom: 20px;+}.board-card-detail>.body>.more-info-side {position: absolute;top: 0;@@ -205,6 +208,7 @@border-right: 1px solid #D8D8D8;margin-right: 30px;}+@media (max-width: 992px) {.board-card-detail>.body>.main {margin-right: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.htmlindex 5da0c5eb25..6aef5ed3aa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html@@ -1,3 +1,4 @@<wicket:extend><div wicket:id="commits"></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists recent commits fixing the issue</div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 65bd1f357b..909096cd3d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -180,10 +180,14 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {update.setHeadCommitHash(request.getHeadCommitHash());update.setMergeBaseCommitHash(request.getBaseCommitHash());- request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY);-OneDev.getInstance(PullRequestManager.class).checkQuality(request);++ if (request.isAllReviewsApproved())+ request.setMergeStrategy(MergeStrategy.DO_NOT_MERGE);+ else+ request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY);}+requestModel = new LoadableDetachableModel<PullRequest>() {@Override@@ -616,17 +620,17 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {});- WebMarkupContainer mergeStrategyContainer = new WebMarkupContainer("mergeStrategy") {+ form.add(newMergeStrategyContainer());++ form.add(new ReviewListPanel("reviewers", requestModel));- @Override- protected void onBeforeRender() {- addOrReplace(newMergeStatusContainer());- super.onBeforeRender();- }-- };- mergeStrategyContainer.setOutputMarkupId(true);- form.add(mergeStrategyContainer);+ form.add(new PullRequestBuildsPanel("builds", requestModel));++ return fragment;+ }++ private Component newMergeStrategyContainer() {+ WebMarkupContainer container = new WebMarkupContainer("mergeStrategy");IModel<MergeStrategy> mergeStrategyModel = new IModel<MergeStrategy>() {@@ -654,31 +658,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- target.add(mergeStrategyContainer);+ Component newContainer = newMergeStrategyContainer();+ container.replaceWith(newContainer);+ target.add(newContainer);}});- mergeStrategyContainer.add(mergeStrategyDropdown);+ container.add(mergeStrategyDropdown);- mergeStrategyContainer.add(new Label("help", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getPullRequest().getMergeStrategy().getDescription();- }-- }));-- form.add(new ReviewListPanel("reviewers", requestModel));-- form.add(new PullRequestBuildsPanel("builds", requestModel));+ container.add(new Label("help", getPullRequest().getMergeStrategy().getDescription()));- return fragment;- }-- private Component newMergeStatusContainer() {- WebMarkupContainer container = new AjaxLazyLoadPanel("status") {+ container.add(new AjaxLazyLoadPanel("status") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -724,8 +715,10 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {return component;}- };- container.setOutputMarkupPlaceholderTag(true);+ });++ container.setOutputMarkupId(true);+return container;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.htmlindex df0ed9f1b2..5834de26b1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html@@ -24,21 +24,6 @@</div></div></div>- <wicket:fragment wicket:id="summaryFrag">- <div class="first-line">- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>- <span wicket:id="number" class="number"></span>- </div>- <div class="second-line clearfix">- <div wicket:id="status" class="status pull-left"></div>- <div class="submission pull-left">- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>- </div>- <div class="comments pull-left" title="Comments">- <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>- </div>- </div>- </wicket:fragment><wicket:fragment wicket:id="sourceFrag"><a wicket:id="link"></a></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.javaindex fd7b786448..6732374bf7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java@@ -52,19 +52,14 @@ import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;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.facade.UserFacade;-import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.PullRequestQueryBehavior;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;+import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;@@ -363,23 +358,16 @@ public class PullRequestListPage extends ProjectPage {@Overridepublic void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- PullRequest request = rowModel.getObject();- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);- QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),- (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());-- Fragment fragment = new Fragment(componentId, "summaryFrag", PullRequestListPage.this);- fragment.add(new Label("number", "#" + request.getNumber()));- Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,- PullRequestActivitiesPage.paramsOf(rowModel.getObject(), position));- link.add(new Label("label", request.getTitle()));- fragment.add(link);- fragment.add(new RequestStatusLabel("status", rowModel));- UserIdent submitterIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());- fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));- fragment.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));- fragment.add(new Label("comments", request.getCommentCount()));- cellItem.add(fragment);+ cellItem.add(new PullRequestSummaryPanel(componentId, rowModel) {++ @Override+ protected QueryPosition getQueryPosition() {+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ return new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ }++ });}@Override@@ -465,7 +453,6 @@ public class PullRequestListPage extends ProjectPage {};-PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.cssindex 2f4dd1a13b..18a46f7dc3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css@@ -29,27 +29,6 @@#request-list>.main>.body td a {color: #444;}-#request-list>.main>.body td.summary .first-line {- margin-bottom: 8px;- font-weight: bold;- font-size: 16px;-}-#request-list>.main>.body td.summary .title {- margin-right: 8px;-}-#request-list>.main>.body td.summary .second-line>* {- margin-right: 12px;-}-#request-list>.main>.body td.summary .second-line>*:last-child {- margin-right: 0;-}-#request-list>.main>.body td.summary .status {- width: 75px;- padding: 6px 8px;-}-#request-list>.main>.body td.summary .second-line {- color: #888;-}#request-list>.main>.body tr.request.new td.new-indicator {background: #4667EE;