diff options
| author | James Moger <james.moger@gitblit.com> | 2011-09-22 15:37:49 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-09-22 15:37:49 -0400 |
| commit | 2548a7e99ce7c6f5b7379a44ec92be80a0adac3d (patch) | |
| tree | 6000c09d7f6acef2f31ad7bd2fcb7ae4b6caf571 /src/com/gitblit/wicket | |
| parent | 9b72a2e674f7cbc320b0b72fc71ad813d296ab12 (diff) | |
| download | gitblit-2548a7e99ce7c6f5b7379a44ec92be80a0adac3d.tar.gz gitblit-2548a7e99ce7c6f5b7379a44ec92be80a0adac3d.zip | |
Refined mirror federation feature. Documentation.
HEAD is now properly reset if mirroring is enabled. Updated the
federation pull status enum to include no change and mirrored states.
Diffstat (limited to 'src/com/gitblit/wicket')
| -rw-r--r-- | src/com/gitblit/wicket/WicketUtils.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/FederationProposalPage.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index a6435d5a..1a24925b 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -115,6 +115,7 @@ public class WicketUtils { public static ContextImage getPullStatusImage(String wicketId, FederationPullStatus status) {
String filename = null;
switch (status) {
+ case MIRRORED:
case PULLED:
filename = "bullet_green.png";
break;
@@ -128,6 +129,7 @@ public class WicketUtils { filename = "bullet_white.png";
break;
case PENDING:
+ case NOCHANGE:
default:
filename = "bullet_black.png";
}
diff --git a/src/com/gitblit/wicket/pages/FederationProposalPage.java b/src/com/gitblit/wicket/pages/FederationProposalPage.java index c2a2d24b..c4b13471 100644 --- a/src/com/gitblit/wicket/pages/FederationProposalPage.java +++ b/src/com/gitblit/wicket/pages/FederationProposalPage.java @@ -79,7 +79,7 @@ public class FederationProposalPage extends BasePage { sb.append(asParam(p, proposal.name, "frequency",
GitBlit.getString(Keys.federation.defaultFrequency, "60 mins")));
sb.append(asParam(p, proposal.name, "folder", proposal.name));
- sb.append(asParam(p, proposal.name, "freeze", "true"));
+ sb.append(asParam(p, proposal.name, "mirror", "true"));
sb.append(asParam(p, proposal.name, "sendStatus", "true"));
sb.append(asParam(p, proposal.name, "notifyOnError", "true"));
sb.append(asParam(p, proposal.name, "exclude", ""));
|