Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-74811] Allow reverting the pull request title change #493

Merged
merged 1 commit into from
Nov 5, 2024
Merged

[JENKINS-74811] Allow reverting the pull request title change #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/jenkins/branch/MultiBranchProjectDisplayNamingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ public String generateName(@NonNull final String rawName, final String displayNa
return format("%s (%s)", displayName, cleanedUpBranchName);
}
},
/**
* Use the raw name.
*/
RAW(true, Messages._MultiBranchProjectDisplayNamingTrait_Raw()) {
@Override
public String generateName(@NonNull final String rawName, final String displayName) {
return rawName;
}
},

;

private final boolean needsObjectDisplayName;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/jenkins/branch/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RateLimitBranchProperty.duration.year=Year
MultiBranchProject.BranchIndexing.displayName=Scan {0}
MultiBranchProject.CopyItemVeto.reason=Copying branch projects outside of their multi-branch container is not supported.
MultiBranchProjectDisplayNamingTrait.DisplayName=Job display name with fallback to name
MultiBranchProjectDisplayNamingTrait.Raw=Name only
MultiBranchProjectDisplayNamingTrait.Raw=Simple name only
MultiBranchProjectDisplayNamingTrait.RawAndDisplayName=Name and, if available, display name
MultiBranchProjectDisplayNamingTrait.TraitDisplayName=Job display name strategy
OrganizationFolder.OrganizationScan.displayName=Scan {0}
Expand Down
9 changes: 9 additions & 0 deletions ...urces/jenkins/branch/MultiBranchProjectDisplayNamingTrait/help-displayNamingStrategy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,14 @@
Value for configuration-as-code: <code>RAW_AND_OBJECT_DISPLAY_NAME</code>
</p>
</li>
<li>
<p>
<strong>Simple name:</strong>
<br>
Just the raw name
<br>
Value for configuration-as-code: <code>RAW</code>
</p>
</li>
</ul>
</div>
6 changes: 6 additions & 0 deletions src/test/java/jenkins/branch/ProjectNamingStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ public void testCompositeStrategy() throws Exception {
testNamingStrategy(MultiBranchProjectDisplayNamingStrategy.RAW_AND_OBJECT_DISPLAY_NAME);
}

@Test
@Issue("JENKINS-74811")
public void testRawStrategy() throws Exception {
testNamingStrategy(MultiBranchProjectDisplayNamingStrategy.RAW);
}

@Test
@Issue("JENKINS-55348")
public void testObjectNameStrategy() throws Exception {
Expand Down