Skip to content

The Unified and Autonomous Development Platform

Minor bug fixes

Robin Shen9029b8092467
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.java
index 9be28773b3..eac63dde87 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
@@ -64,6 +64,7 @@ import io.onedev.k8shelper.ServerSideFacade;
import io.onedev.k8shelper.StepFacade;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecParseException;
import io.onedev.server.buildspec.Service;
import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.buildspec.job.action.condition.ActionCondition;
@@ -1074,6 +1075,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
}
+ } catch (BuildSpecParseException e) {
+ logger.warn("Malformed build spec (project: {}, branch: {})",
+ project.getPath(), defaultBranch);
} finally {
JobSecretAuthorizationContext.pop();
}
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java
index 0cb1ce7638..cfd4dd68ff 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java
@@ -18,7 +18,8 @@ public abstract class AbstractSingleEnvironmentManager extends AbstractEnvironme
@Listen
public synchronized void on(SystemStopping event) {
- env.close();
+ if (env != null)
+ env.close();
}
protected abstract File getEnvDir();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index d40f408344..b2350abc95 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -1,3 +1,7 @@
+.CommitDetailPage>body>.main {
+ min-width: 768px;
+}
+
.commit-detail .list-group-item {
padding: 1.25rem 1.5rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java
new file mode 100644
index 0000000000..5b9c5f32bd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.compare;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class RevisionCompareCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public RevisionCompareCssResourceReference() {
+ super(RevisionCompareCssResourceReference.class, "revision-compare.css");
+ }
+
+}
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.java
index 327d986987..2a684a3d31 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
@@ -57,7 +57,6 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectAndRevision;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -553,6 +552,8 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
+ response.render(CssHeaderItem.forReference(
+ new io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference()));
response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
new file mode 100644
index 0000000000..cc16ca1e4a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
@@ -0,0 +1,3 @@
+.RevisionComparePage>body>.main {
+ min-width: 768px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
index 1dd0098cf0..6aaa6ed550 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css
@@ -1,3 +1,6 @@
+.PullRequestChangesPage>body>.main {
+ min-width: 768px;
+}
.commits-selector ul a {
text-decoration: none;
display: block;