Skip to content

Commit

Permalink
Merge pull request #471 from strangelookingnerd/fix_monitor_label
Browse files Browse the repository at this point in the history
Add displayName and description to PropertyMigration
  • Loading branch information
jglick authored Jul 25, 2024
2 parents dcdf0b2 + d0b2701 commit 969d9eb
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/main/java/jenkins/branch/PropertyMigration.java
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ public boolean isActivated() {
return !missing.isEmpty();
}

@Override
public String getDisplayName() {
return Messages.PropertyMigration_MonitorImpl_DisplayName();

Check warning on line 207 in src/main/java/jenkins/branch/PropertyMigration.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 207 is not covered by tests
}

public List<PropertyMigration<?, ?>> getPending() {
List<PropertyMigration<?, ?>> result = new ArrayList<>(missing.size());
for (PropertyMigration<?, ?> m : missing) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/jenkins/branch/Messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ NoTriggerBranchProperty.suppress_automatic_scm_triggering=Suppress automatic SCM
NoTriggerProperty.strategy.indexing=For matching branches suppress builds triggered by indexing (continue to honor webhooks)
NoTriggerProperty.strategy.events=For matching branches suppress builds triggered by webhooks (continue to trigger from indexing)
NoTriggerProperty.strategy.none=For matching branches schedule all builds (nothing is suppressed)
PropertyMigration.MonitorImpl.DisplayName=Folder Property Migration
RateLimitBranchProperty.ApproxDaysBetweenBuilds=Approximately {0,choice,1\#a day|1<{0,number,integer} days} between builds
RateLimitBranchProperty.ApproxHoursBetweenBuilds=Approximately {0,choice,1\#an hour|1<{0,number,integer} hours} between builds
RateLimitBranchProperty.ApproxMinsBetweenBuilds=Approximately {0,choice,1\#a minute|1<{0,number,integer} minutes} between builds
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%blurb}
</j:jelly>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# The MIT License
#
# Copyright (c) 2018, CloudBees, Inc., Stephen Connolly.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
blurb=Allows administrators to migrate folder properties that have been deprecated in previous plugin releases.

0 comments on commit 969d9eb

Please sign in to comment.