Remove remaining TicGit tickets references

Change-Id: I431659cf1d57a8d9bffb065fa47e1296e7f8c838

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index cb37b5043a90462ae0454e83fe955eb90834938e..5eec7a9350dd25e204ac8b0f109069a1e5407a6b 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -2002,7 +2002,6 @@ public class GitBlit implements ServletContextListener {
                        model.description = getConfig(config, "description", "");
                        model.originRepository = getConfig(config, "originRepository", null);
                        model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));
-                       model.useTickets = getConfig(config, "useTickets", false);
                        model.useDocs = getConfig(config, "useDocs", false);
                        model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);
                        model.incrementalPushTagPrefix = getConfig(config, "incrementalPushTagPrefix", null);
@@ -2563,7 +2562,6 @@ public class GitBlit implements ServletContextListener {
                config.setString(Constants.CONFIG_GITBLIT, null, "description", repository.description);
                config.setString(Constants.CONFIG_GITBLIT, null, "originRepository", repository.originRepository);
                config.setString(Constants.CONFIG_GITBLIT, null, "owner", ArrayUtils.toString(repository.owners));
-               config.setBoolean(Constants.CONFIG_GITBLIT, null, "useTickets", repository.useTickets);
                config.setBoolean(Constants.CONFIG_GITBLIT, null, "useDocs", repository.useDocs);
                config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalPushTags", repository.useIncrementalPushTags);
                if (StringUtils.isEmpty(repository.incrementalPushTagPrefix) ||

diff --git a/src/main/java/com/gitblit/client/EditRepositoryDialog.java b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
index 4a8a215351e6c52929a672e3e4ae59f3547b6ba4..f4d945050963c0c18d3c3a12dd37b64a87882d0e 100644 (file)
--- a/src/main/java/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
@@ -88,8 +88,6 @@ public class EditRepositoryDialog extends JDialog {
 \r
        private JTextField descriptionField;\r
 \r
-       private JCheckBox useTickets;\r
-\r
        private JCheckBox useDocs;\r
 \r
        private JCheckBox useIncrementalPushTags;\r
@@ -211,8 +209,6 @@ public class EditRepositoryDialog extends JDialog {
 \r
                ownersPalette = new JPalette<String>(true);\r
 \r
-               useTickets = new JCheckBox(Translation.get("gb.useTicketsDescription"),\r
-                               anRepository.useTickets);\r
                useDocs = new JCheckBox(Translation.get("gb.useDocsDescription"),\r
                                anRepository.useDocs);\r
                useIncrementalPushTags = new JCheckBox(Translation.get("gb.useIncrementalPushTagsDescription"),\r
@@ -310,8 +306,6 @@ public class EditRepositoryDialog extends JDialog {
                fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod));\r
                fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold));\r
 \r
-               fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),\r
-                               useTickets));\r
                fieldsPanel\r
                                .add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));\r
                fieldsPanel\r
@@ -570,7 +564,6 @@ public class EditRepositoryDialog extends JDialog {
                                : headRefField.getSelectedItem().toString();\r
                repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();\r
                repository.gcThreshold = gcThreshold.getText();\r
-               repository.useTickets = useTickets.isSelected();\r
                repository.useDocs = useDocs.isSelected();\r
                repository.useIncrementalPushTags = useIncrementalPushTags.isSelected();\r
                repository.showRemoteBranches = showRemoteBranches.isSelected();\r

diff --git a/src/main/java/com/gitblit/client/IndicatorsRenderer.java b/src/main/java/com/gitblit/client/IndicatorsRenderer.java
index 66cce018b3ae874d63eb26a21ead4753d3eb7a23..5b61df6623804d50104586b03a38007bbb0b9c3b 100644 (file)
--- a/src/main/java/com/gitblit/client/IndicatorsRenderer.java
+++ b/src/main/java/com/gitblit/client/IndicatorsRenderer.java
@@ -46,8 +46,6 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
 \r
        private final ImageIcon viewIcon;\r
 \r
-       private final ImageIcon tixIcon;\r
-\r
        private final ImageIcon doxIcon;\r
 \r
        private final ImageIcon frozenIcon;\r
@@ -64,7 +62,6 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
                pushIcon = new ImageIcon(getClass().getResource("/lock_go_16x16.png"));\r
                pullIcon = new ImageIcon(getClass().getResource("/lock_pull_16x16.png"));\r
                viewIcon = new ImageIcon(getClass().getResource("/shield_16x16.png"));\r
-               tixIcon = new ImageIcon(getClass().getResource("/bug_16x16.png"));\r
                doxIcon = new ImageIcon(getClass().getResource("/book_16x16.png"));\r
                frozenIcon = new ImageIcon(getClass().getResource("/cold_16x16.png"));\r
                federatedIcon = new ImageIcon(getClass().getResource("/federated_16x16.png"));\r
@@ -93,11 +90,6 @@ public class IndicatorsRenderer extends JPanel implements TableCellRenderer, Ser
                                tooltip.append(Translation.get("gb.isFork")).append("<br/>");\r
                                add(icon);\r
                        }\r
-                       if (model.useTickets) {\r
-                               JLabel icon = new JLabel(tixIcon);\r
-                               tooltip.append(Translation.get("gb.tickets")).append("<br/>");\r
-                               add(icon);\r
-                       }\r
                        if (model.useDocs) {\r
                                JLabel icon = new JLabel(doxIcon);\r
                                tooltip.append(Translation.get("gb.docs")).append("<br/>");\r

diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java
index 42331c4eb35c10e9317b59106786ccdbc5fe4e46..2476834a9cae7079d9a50e362a53bac9dbe7cea0 100644 (file)
--- a/src/main/java/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
@@ -51,7 +51,6 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
        public String lastChangeAuthor;\r
        public boolean hasCommits;\r
        public boolean showRemoteBranches;\r
-       public boolean useTickets;\r
        public boolean useDocs;\r
        public boolean useIncrementalPushTags;\r
        public String incrementalPushTagPrefix;\r
@@ -213,7 +212,6 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
                clone.showRemoteBranches = false;\r
                clone.allowForks = false;\r
                clone.useDocs = useDocs;\r
-               clone.useTickets = useTickets;\r
                clone.skipSizeCalculation = skipSizeCalculation;\r
                clone.skipSummaryMetrics = skipSummaryMetrics;\r
                clone.sparkleshareId = sparkleshareId;\r

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index f7d1f7331e3e0142aff66bff777d173f38e5afa8..6e41a7de9afe691de14e0eacf7a1921275d35afa 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -33,7 +33,6 @@
                                <tr><th><wicket:message key="gb.gcPeriod"></wicket:message></th><td class="edit"><select class="span2" wicket:id="gcPeriod" tabindex="5" /> &nbsp;<span class="help-inline"><wicket:message key="gb.gcPeriodDescription"></wicket:message></span></td></tr>\r
                                <tr><th><wicket:message key="gb.gcThreshold"></wicket:message></th><td class="edit"><input class="span1" type="text" wicket:id="gcThreshold" tabindex="6" /> &nbsp;<span class="help-inline"><wicket:message key="gb.gcThresholdDescription"></wicket:message></span></td></tr>\r
                                <tr><th colspan="2"><hr/></th></tr>\r
-                               <tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useTickets" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useTicketsDescription"></wicket:message></span></label></td></tr>\r
                                <tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useDocs" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useDocsDescription"></wicket:message></span></label></td></tr>\r
                                <tr><th><wicket:message key="gb.enableIncrementalPushTags"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useIncrementalPushTags" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useIncrementalPushTagsDescription"></wicket:message></span></label></td></tr>\r
                                <tr><th><wicket:message key="gb.showRemoteBranches"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showRemoteBranches" tabindex="9" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showRemoteBranchesDescription"></wicket:message></span></label></td></tr>\r

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index f92a91f35349e3438debc9d667b6a4c19f7fdf2b..cde60314dbf2c74d00f4ec46ff6fd662c39d6535 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -445,7 +445,6 @@ public class EditRepositoryPage extends RootSubPage {
                }\r
                form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,\r
                                new FederationTypeRenderer()));\r
-               form.add(new CheckBox("useTickets"));\r
                form.add(new CheckBox("useDocs"));\r
                form.add(new CheckBox("useIncrementalPushTags"));\r
                form.add(new CheckBox("showRemoteBranches"));\r

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
index 81a4c6eb77b92db1c8e7736db9b36bccb6245e5c..f078650501d36ccd69cc867e5420246b24f204e6 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -89,7 +89,7 @@
         <td class="left" style="padding-left:3px;" ><b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>\r
         <td class="hidden-phone"><span class="list" wicket:id="repositoryDescription">[repository description]</span></td>\r
         <td class="hidden-tablet hidden-phone author"><span wicket:id="repositoryOwner">[repository owner]</span></td>\r
-        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>\r
+        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>\r
         <td><span wicket:id="repositoryLastChange">[last change]</span></td>\r
         <td class="hidden-phone" style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>\r
         <td class="rightAlign">\r

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 89fc02ac098a447abac8f7d92a3130cbec7e2551..f9597b5ad12f6a3cf6cd4149b3f97fda889494d7 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -250,13 +250,6 @@ public class RepositoriesPanel extends BasePanel {
                                        row.add(WicketUtils.newClearPixel("forkIcon").setVisible(false));\r
                                }\r
 \r
-                               if (entry.useTickets) {\r
-                                       row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png",\r
-                                                       getString("gb.tickets")));\r
-                               } else {\r
-                                       row.add(WicketUtils.newBlankImage("ticketsIcon"));\r
-                               }\r
-\r
                                if (entry.useDocs) {\r
                                        row.add(WicketUtils\r
                                                        .newImage("docsIcon", "book_16x16.png", getString("gb.docs")));\r

diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 2d653af08d089139c59b02ff1aa981289b9db95b..239f5238b1e65c343ba1ffffdc379e10f3439d5d 100644 (file)
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -160,7 +160,6 @@ public class GitBlitSuite {
                        cloneOrFetch("test/ambition.git", "https://github.com/defunkt/ambition.git");\r
                        cloneOrFetch("test/gitective.git", "https://github.com/kevinsawicki/gitective.git");\r
 \r
-                       enableTickets("ticgit.git");\r
                        enableDocs("ticgit.git");\r
                        showRemoteBranches("ticgit.git");\r
                        automaticallyTagBranchTips("ticgit.git");\r
@@ -184,16 +183,6 @@ public class GitBlitSuite {
                System.out.println("done.");\r
        }\r
 \r
-       private static void enableTickets(String repositoryName) {\r
-               try {\r
-                       RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);\r
-                       model.useTickets = true;\r
-                       GitBlit.self().updateRepositoryModel(model.name, model, false);\r
-               } catch (GitBlitException g) {\r
-                       g.printStackTrace();\r
-               }\r
-       }\r
-\r
        private static void enableDocs(String repositoryName) {\r
                try {\r
                        RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);\r