Merge pull request #123 from kxyfyh/new_branch

James Moger

2013-11-19 fa5e44bf284f09883c84b7cb6c6ccb8827680624

Merge pull request #123 from kxyfyh/new_branch

Disable submodule raw links in commit & commitdiff page. UTF-8 page encoding.

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

@@ -137,6 +137,8 @@
        mount("/user", UserPage.class, "user");

        mount("/forks", ForksPage.class, "r");

        mount("/fork", ForkPage.class, "r");

		
        getMarkupSettings().setDefaultMarkupEncoding("UTF-8");

    }



    private void mount(String location, Class<? extends WebPage> clazz, String... parameters) {


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

@@ -153,6 +153,7 @@

                // quick links
                if (entry.isSubmodule()) {
                    item.add(new ExternalLink("raw", "").setEnabled(false));
                    // submodule
                    item.add(new ExternalLink("patch", "").setEnabled(false));
                    item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils

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

@@ -199,8 +199,11 @@
                                    .newPathParameter(repositoryName, entry.commitId, path)));

                }



				
                // quick links

                if (entry.isSubmodule()) {

                    item.add(new ExternalLink("raw", "").setEnabled(false));

					
                    // submodule

                    item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                            .newPathParameter(repositoryName, entry.commitId, entry.path))