Skip to content

The Unified and Autonomous Development Platform

Some minor improvements

Robin Shene33f4bac2a08
diff --git a/doc/images/renovate-integration.png b/doc/images/renovate-integration.png
new file mode 100644
index 0000000000..40e32551b9
Binary files /dev/null and b/doc/images/renovate-integration.png differ
diff --git a/readme.md b/readme.md
index 0b06f40d20..c42dc46f8f 100644
--- a/readme.md
+++ b/readme.md
@@ -24,13 +24,13 @@ Fast code search with regular expression.
![code search and navigation](./doc/images/code-navigation.gif)
-## 👮‍ Flexible security and compliance scan
+## 📦 Renovate integration to update project dependencies
-Scan code dependencies, built binaries, or container images to find security
-vulnerabilities, license violations, or secret exposures.
-[**Tutorial**] (https://docs.onedev.io/category/security-and-compliance-scan)
+Integrate with Renovate to update project dependencies via pull requests.
+Merge pull requests automatically when approved by required reviewers, or pass required tests.
+[**Tutorial**](https://docs.onedev.io/tutorials/cicd/dependency-update)
-![vulnerabilities](./doc/images/vulnerabilities.png)
+![vulnerabilities](./doc/images/renovate-integration.png)
## 🚦 Annotate code with coverage and problems
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.java
index c5ffed0b81..be8f2ac453 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
@@ -1,6 +1,5 @@
package io.onedev.server.git;
-import com.google.common.base.Preconditions;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
@@ -88,16 +87,8 @@ public class GitFilter implements Filter {
}
if (StringUtils.isBlank(projectPath))
throw new ExplicitException("Project not specified");
- if (facade == null) {
- if (clusterAccess || upload) {
- throw new ExplicitException(String.format("Unable to find project '%s'", projectPath));
- } else {
- Project project = projectManager.setup(projectPath);
- Preconditions.checkState(project.isNew());
- projectManager.create(project);
- facade = project.getFacade();
- }
- }
+ if (facade == null)
+ throw new ExplicitException(String.format("Unable to find project '%s'", projectPath));
return facade.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommand.java b/server-core/src/main/java/io/onedev/server/git/SshCommand.java
index fdac81ddb8..7a6a4c3bc5 100644
--- a/server-core/src/main/java/io/onedev/server/git/SshCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/SshCommand.java
@@ -1,6 +1,5 @@
package io.onedev.server.git;
-import com.google.common.base.Preconditions;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.ExecutionResult;
@@ -18,7 +17,6 @@ import io.onedev.server.ssh.SshManager;
import io.onedev.server.util.OutputStreamWrapper;
import io.onedev.server.util.concurrent.PrioritizedRunnable;
import io.onedev.server.util.concurrent.WorkExecutor;
-import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.util.ThreadContext;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.server.Environment;
@@ -92,23 +90,8 @@ class SshCommand implements Command, ServerSessionAware {
if (StringUtils.isBlank(projectPath))
throw new ExplicitException("Project not specified");
if (projectFacade == null) {
- if (clusterAccess || upload) {
- onExit(-1, "Unable to find project '" + projectPath + "'");
- return;
- } else {
- try {
- Project project = projectManager.setup(projectPath);
- Preconditions.checkState(project.isNew());
- projectManager.create(project);
- projectFacade = project.getFacade();
- } catch (UnauthorizedException e) {
- if (e.getMessage() != null)
- onExit(-1, e.getMessage());
- else
- onExit(-1, "Permission denied");
- return;
- }
- }
+ onExit(-1, "Unable to find project '" + projectPath + "'");
+ return;
}
ClusterManager clusterManager = OneDev.getInstance(ClusterManager.class);
diff --git a/server-ee b/server-ee
index 58346b5544..fbcd645136 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 58346b5544e6337e2d7b8f39c04c5f5c1e38e656
+Subproject commit fbcd6451366784fb9612db0e7177f1b408ed7445