From 1f3dff18737576a30bad8e1b7ea45c00fcad265a Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 3 Mar 2014 17:02:52 -0500 Subject: [PATCH] Eliminate problematic HEAD links from the blob, blame, and tree pages --- releases.moxie | 1 + src/main/java/com/gitblit/wicket/pages/BlamePage.html | 2 +- src/main/java/com/gitblit/wicket/pages/BlamePage.java | 3 --- src/main/java/com/gitblit/wicket/pages/BlobPage.html | 2 +- src/main/java/com/gitblit/wicket/pages/BlobPage.java | 4 ---- src/main/java/com/gitblit/wicket/pages/TreePage.html | 2 +- src/main/java/com/gitblit/wicket/pages/TreePage.java | 3 --- 7 files changed, 4 insertions(+), 13 deletions(-) diff --git a/releases.moxie b/releases.moxie index 7bdd2f0b..cd4e43ea 100644 --- a/releases.moxie +++ b/releases.moxie @@ -52,6 +52,7 @@ r20: { - Retrieve LDAP groups with dereferencing aliases (pr-122) - Revised committer verification to require a matching displayname or account name AND the email address - Serve repositories on both /r and /git, displaying /r because it is shorter + - Eliminate HEAD from the blob, blame, and tree pages. That assumed a resource was available in HEAD and it may not be. additions: - Added color modes for the blame page (issue-2) - Added an optional MirrorService which will periodically fetch ref updates from source repositories for mirrors (issue-5). Repositories must be manually cloned using native git and "--mirror". diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.html b/src/main/java/com/gitblit/wicket/pages/BlamePage.html index 1da9671b..126c337a 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlamePage.html +++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html @@ -9,7 +9,7 @@
- | | | | + | | |
diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java index ae85c433..c2280a2e 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlamePage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.java @@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; @@ -103,8 +102,6 @@ public class BlamePage extends RepositoryPage { WicketUtils.newObjectParameter(repositoryName, objectId))); // blame page links - add(new BookmarkablePageLink("headLink", BlamePage.class, - WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath))); add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.html b/src/main/java/com/gitblit/wicket/pages/BlobPage.html index d45e3c3b..3f9a959a 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.html +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.html @@ -46,7 +46,7 @@
- | | | + | |
diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java index 6c73ec10..299d8dbc 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java @@ -24,7 +24,6 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -60,7 +59,6 @@ public class BlobPage extends RepositoryPage { add(new BookmarkablePageLink("historyLink", HistoryPage.class).setEnabled(false)); add(new BookmarkablePageLink("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); - add(new BookmarkablePageLink("headLink", BlobPage.class).setEnabled(false)); add(new CommitHeaderPanel("commitHeader", objectId)); add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings)); @@ -91,8 +89,6 @@ public class BlobPage extends RepositoryPage { WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); add(new BookmarkablePageLink("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath))); - add(new BookmarkablePageLink("headLink", BlobPage.class, - WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath))); add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.html b/src/main/java/com/gitblit/wicket/pages/TreePage.html index 282e28f8..51a996ff 100644 --- a/src/main/java/com/gitblit/wicket/pages/TreePage.html +++ b/src/main/java/com/gitblit/wicket/pages/TreePage.html @@ -9,7 +9,7 @@
- | | + |
diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java index df6507f5..d6bf1fe1 100644 --- a/src/main/java/com/gitblit/wicket/pages/TreePage.java +++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java @@ -24,7 +24,6 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -56,8 +55,6 @@ public class TreePage extends RepositoryPage { // tree page links add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path))); - add(new BookmarkablePageLink("headLink", TreePage.class, - WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path))); add(new CompressedDownloadsPanel("compressedLinks", getRequest() .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path)); -- 2.39.5