From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
index ebe1530..8aec9e6 100644
--- a/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
@@ -23,7 +23,6 @@
import org.apache.wicket.markup.html.basic.Label;
import com.gitblit.Constants.FederationToken;
-import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.FederationProposal;
import com.gitblit.models.RepositoryModel;
@@ -37,14 +36,12 @@
private final String PROPS_PATTERN = "{0} = {1}\n";
- private final String WEBXML_PATTERN = "\n<context-param>\n\t<param-name>{0}</param-name>\n\t<param-value>{1}</param-value>\n</context-param>\n";
-
public ReviewProposalPage(PageParameters params) {
super(params);
final String token = WicketUtils.getToken(params);
- FederationProposal proposal = GitBlit.self().getPendingFederationProposal(token);
+ FederationProposal proposal = app().federation().getPendingFederationProposal(token);
if (proposal == null) {
error(getString("gb.couldNotFindFederationProposal"), true);
}
@@ -58,14 +55,7 @@
add(new Label("token", proposal.token));
add(new Label("tokenType", proposal.tokenType.name()));
- String p;
- if (GitBlit.isGO()) {
- // gitblit.properties definition
- p = PROPS_PATTERN;
- } else {
- // web.xml definition
- p = WEBXML_PATTERN;
- }
+ String p = PROPS_PATTERN;
// build proposed definition
StringBuilder sb = new StringBuilder();
@@ -77,7 +67,7 @@
sb.append(asParam(p, proposal.name, "mergeAccounts", "false"));
}
sb.append(asParam(p, proposal.name, "frequency",
- GitBlit.getString(Keys.federation.defaultFrequency, "60 mins")));
+ app().settings().getString(Keys.federation.defaultFrequency, "60 mins")));
sb.append(asParam(p, proposal.name, "folder", proposal.name));
sb.append(asParam(p, proposal.name, "bare", "true"));
sb.append(asParam(p, proposal.name, "mirror", "true"));
--
Gitblit v1.9.1