Skip to content

Commit 79d6640

Browse files
committed
chore: Bump version
1 parent 30c7486 commit 79d6640

File tree

70 files changed

+77
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+77
-79
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.3.0</version>
1010
</parent>
1111
<artifactId>server</artifactId>
12-
<version>14.2.0</version>
12+
<version>14.1.7</version>
1313
<packaging>pom</packaging>
1414
<build>
1515
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>

server-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.onedev</groupId>
99
<artifactId>server</artifactId>
10-
<version>14.2.0</version>
10+
<version>14.1.7</version>
1111
</parent>
1212
<build>
1313
<plugins>

server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public String getValue(Build build) {
116116
return null;
117117
}
118118
},
119-
ISSUE_BRANCH {
119+
SUGGESTED_ISSUE_BRANCH {
120120
@Override
121121
public String getValue(Build build) {
122122
if (build.getIssue() != null)

server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,8 +1333,8 @@ public String suggestBranch(Issue issue) {
13331333
var chatModel = settingService.getAiSetting().getLiteModel();
13341334
if (chatModel != null) {
13351335
var systemMessage = new SystemMessage("""
1336-
Convert the given title into a short slug for a git branch name.
1337-
Rules: use only lowercase letters, numbers and hyphens; no spaces or other special characters;
1336+
Convert the given title into a short slug for a git branch name.
1337+
Rules: use only lowercase letters (for non-english title, translate to english first), numbers and hyphens; no spaces or other special characters;
13381338
replace spaces with single hyphens; output only the slug, nothing else; maximum 50 characters.""");
13391339
for (int attempt = 0; attempt < 3; attempt++) {
13401340
try {

server-core/src/main/java/io/onedev/server/web/page/base/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ onedev.server = {
373373
if (message == "ErrorMessage") {
374374
$("body>.error").hide();
375375
$(".page-error").show();
376-
} else if (message == "KeepAlive") {
376+
} else if (message == "KeepAlive") {
377377
Wicket.WebSocket.send("KeepAlive");
378378
clearTimeout(webSocketTimeoutTimer);
379379
webSocketTimeoutTimer = setTimeout(onWebSocketTimeout, webSocketTimeout);

server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,10 @@ public void onWebSocketConnect(final Session session) {
7373
}
7474

7575
private void run(Runnable runnable) {
76-
if (OneDev.getInstance().isReady()) {
77-
SessionService sessionService = OneDev.getInstance(SessionService.class);
78-
Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);
79-
ThreadContext.bind(subject);
80-
sessionService.run(runnable);
81-
}
76+
SessionService sessionService = OneDev.getInstance(SessionService.class);
77+
Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);
78+
ThreadContext.bind(subject);
79+
sessionService.run(runnable);
8280
}
8381

8482
@Override

server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,10 +456,10 @@ public void testMergeWithLinkAndDirConflict() throws Exception {
456456

457457
@Test
458458
public void testNormalizeForBranch() {
459-
assertEquals("", GitUtils.normalizeForBranch(""));
460-
assertEquals("", GitUtils.normalizeForBranch(" "));
461-
assertEquals("", GitUtils.normalizeForBranch("---"));
462-
assertEquals("", GitUtils.normalizeForBranch("中文测试"));
459+
assertNull(GitUtils.normalizeForBranch(""));
460+
assertNull(GitUtils.normalizeForBranch(" "));
461+
assertNull(GitUtils.normalizeForBranch("---"));
462+
assertNull(GitUtils.normalizeForBranch("中文测试"));
463463

464464
assertEquals("fix-bug", GitUtils.normalizeForBranch("Fix bug"));
465465
assertEquals("fix-bug", GitUtils.normalizeForBranch("Fix bug"));

server-ee

Submodule server-ee updated from 58c26a1 to c6075dc

server-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.onedev</groupId>
88
<artifactId>server</artifactId>
9-
<version>14.2.0</version>
9+
<version>14.1.7</version>
1010
</parent>
1111
<dependencies>
1212
<dependency>

server-plugin/server-plugin-archetype/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.onedev</groupId>
88
<artifactId>server-plugin</artifactId>
9-
<version>14.2.0</version>
9+
<version>14.1.7</version>
1010
</parent>
1111
<build>
1212
<resources>

0 commit comments

Comments
 (0)