Skip to content

Commit 2d8ae54

Browse files
Robert FührichtRobert Führicht
Robert Führicht
authored and
Robert Führicht
committed
adds properly formatted documentation to the tickets page
1 parent 406da52 commit 2d8ae54

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/main/java/com/gitblit/wicket/GitBlitWebApp.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,8 @@ gb.requireApprovalDescription = patchsets must be approved before merge button i
559559
gb.requireScore = require score
560560
gb.requireScoreDescription = patchsets must be rated this high before merge button is enabled
561561
gb.writeSignoffCommit = write signoff commit
562-
gb.writeSignoffCommitDescription = reviewed patchsets will have lines of the form 'value: reviewer name <reviewer email>' added to their merge commit.\nE.g. if set to 'Signed-off-by': 'Signed-off-by: reviewer <[email protected]>'.
562+
gb.writeSignoffCommitDescription = reviewed patchsets will have lines of the form <em>value: reviewer name &lt;reviewer email&gt;</em> added to their merge commit.\nE.g. if set to <em>Signed-off-by</em>: <code>Signed-off-by: reviewer &lt;[email protected]&gt;</code>. Please see ${commitMessageLink} on the meaning of possible values for this.
563+
gb.writeSignoffCommitLink = Commit Message Conventions in the Linux Kernel
563564
gb.topic = topic
564565
gb.proposalTickets = proposed changes
565566
gb.bugTickets = bugs

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html

+8-1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ <h4><wicket:message key="gb.ticketSettings"></wicket:message></h4>
124124
<div wicket:id="requireApproval"></div>
125125
<div wicket:id="requireScore"></div>
126126
<div wicket:id="writeSignoffCommit"></div>
127+
<div>
128+
<wicket:message key="gb.writeSignoffCommitDescription">
129+
<a target="_new" wicket:id="commitMessageLink">
130+
<wicket:message key="gb.writeSignoffCommitLink"></wicket:message>
131+
</a>
132+
</wicket:message>
133+
</div>
127134
<div wicket:id="mergeTo"></div>
128135
<div wicket:id="mergeType"></div>
129136

@@ -202,4 +209,4 @@ <h4><wicket:message key="gb.deleteRepositoryHeader"></wicket:message></h4>
202209
</body>
203210

204211
</wicket:extend>
205-
</html>
212+
</html>

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.wicket.markup.html.form.CheckBox;
3838
import org.apache.wicket.markup.html.form.ChoiceRenderer;
3939
import org.apache.wicket.markup.html.form.DropDownChoice;
40+
import org.apache.wicket.markup.html.link.ExternalLink;
4041
import org.apache.wicket.markup.html.form.Form;
4142
import org.apache.wicket.markup.html.form.IChoiceRenderer;
4243
import org.apache.wicket.markup.html.form.TextField;
@@ -94,6 +95,8 @@ public class EditRepositoryPage extends RootSubPage {
9495

9596
private IModel<String> mailingLists;
9697

98+
private final static String COMMIT_MESSAGE_LINK = "https://git.wiki.kernel.org/index.php/CommitMessageConventions";
99+
97100
public EditRepositoryPage() {
98101
// create constructor
99102
super();
@@ -411,6 +414,8 @@ protected void onSubmit() {
411414
// do not let the browser pre-populate these fields
412415
form.add(new SimpleAttributeModifier("autocomplete", "off"));
413416

417+
// adds documentation link for localization
418+
form.add(new ExternalLink("commitMessageLink", COMMIT_MESSAGE_LINK));
414419

415420
//
416421
//
@@ -469,7 +474,7 @@ protected void onSubmit() {
469474
);
470475
form.add(new ChoiceOption<String>("writeSignoffCommit",
471476
getString("gb.writeSignoffCommit"),
472-
getString("gb.writeSignoffCommitDescription"),
477+
new String(),
473478
new PropertyModel<String>(repositoryModel, "writeSignoffCommit"),
474479
signoffCommitMsgs));
475480
form.add(new ChoiceOption<String>("mergeTo",

0 commit comments

Comments
 (0)