archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' of https://code.onedev.io/onedev/server

Browse Source
This commit is contained in:
Robin Shen 2024-11-21 09:18:20 +08:00
commit 0f8fc8b785
65 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -9,7 +9,7 @@
<version>1.2.3</version>
</parent>
<artifactId>server</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>

2
server-core/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<build>
<plugins>

2
server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
View File

@ -906,7 +906,7 @@ onedev.server.blobTextDiff = {
var $endTd = markInfo.endTd;
if ($startTd && $endTd) {
var $scrollParent = $startTd.scrollParent();
var marginTop = $startTd.closest(".text-diff").prev().height() + 120;
var marginTop = $startTd.closest(".text-diff").parent().prev().height() + 120;
$scrollParent.scrollTop($startTd.offset().top - $scrollParent.offset().top + $scrollParent.scrollTop()-marginTop);
}
},

2
server-ee

@ -1 +1 @@
Subproject commit bc95453cd9f1742ebca7818e4bf48a69faa8db6e
Subproject commit b65fb627e3703c7d67a36077b888b318c22b1a6e

2
server-plugin/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-archetype/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<build>
<resources>

2
server-plugin/server-plugin-authenticator-ldap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>

2
server-plugin/server-plugin-buildspec-bazel/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>

2
server-plugin/server-plugin-buildspec-cmake/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-dotnet/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-golang/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-gradle/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-maven/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-node/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>

2
server-plugin/server-plugin-buildspec-python/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-buildspec-rust/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-executor-kubernetes/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>

2
server-plugin/server-plugin-executor-remotedocker/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-executor-remoteshell/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-executor-serverdocker/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>

2
server-plugin/server-plugin-executor-servershell/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>

2
server-plugin/server-plugin-import-bitbucketcloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>

2
server-plugin/server-plugin-import-gitea/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>

2
server-plugin/server-plugin-import-github/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>

2
server-plugin/server-plugin-import-gitlab/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>

2
server-plugin/server-plugin-import-jiracloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>

2
server-plugin/server-plugin-import-url/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>

2
server-plugin/server-plugin-import-youtrack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>

2
server-plugin/server-plugin-mailservice-gmail/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.gmail.GmailModule</moduleClass>

2
server-plugin/server-plugin-mailservice-office365/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.office365.Office365Module</moduleClass>

2
server-plugin/server-plugin-mailservice-smtpimap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.smtpimap.SmtpImapModule</moduleClass>

2
server-plugin/server-plugin-notification-discord/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>

2
server-plugin/server-plugin-notification-ntfy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>

2
server-plugin/server-plugin-notification-slack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>

2
server-plugin/server-plugin-pack-container/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-pack-gem/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-pack-maven/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-pack-npm/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-pack-nuget/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-pack-pypi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-checkstyle/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-clippy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-clover/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-cobertura/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-coverage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>

2
server-plugin/server-plugin-report-cpd/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-cppcheck/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-gtest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-html/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>

2
server-plugin/server-plugin-report-jacoco/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-jest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-junit/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-markdown/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>

2
server-plugin/server-plugin-report-mypy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-pmd/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-problem/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>

2
server-plugin/server-plugin-report-pylint/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-roslynator/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-ruff/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-spotbugs/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-trx/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-unittest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>

2
server-plugin/server-plugin-sso-discord/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>

2
server-plugin/server-plugin-sso-openid/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>

2
server-product/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>11.5.2</version>
<version>11.5.3</version>
</parent>
<dependencies>
<dependency>