[Bps-public-commit] RT-Extension-rt_cpan_org branch, master, updated. 398788eb8f60f379eca3972b093a30a5c9feb777

[Kevin Falcone]

The branch, master has been updated
       via  398788eb8f60f379eca3972b093a30a5c9feb777 (commit)
      from  07697aa9eec531b9f59b73525b9e24e2cd9afa5b (commit)

Summary of changes:
 patches/4.0.15-admin-queues.patch              | 26 ---------------------
 patches/4.0.15-avoid-linking-punctuation.patch | 31 --------------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 patches/4.0.15-admin-queues.patch
 delete mode 100644 patches/4.0.15-avoid-linking-punctuation.patch

- Log -----------------------------------------------------------------
commit 398788eb8f60f379eca3972b093a30a5c9feb777
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Oct 28 14:50:29 2013 -0400

    These two patches are in 4.0.18, so can be deleted
    
    The people linking patch is on 4.0-trunk but not yet in a release.

diff --git a/patches/4.0.15-admin-queues.patch b/patches/4.0.15-admin-queues.patch
deleted file mode 100644
index 02729cc..0000000
--- a/patches/4.0.15-admin-queues.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 944109e78909187e4427557380f16f34a93c9727 Mon Sep 17 00:00:00 2001
-From: Thomas Sibley <trs at bestpractical.com>
-Date: Tue, 14 May 2013 15:27:19 -0700
-Subject: [PATCH] Limit the Admin Queues list to 50 rows per page by default
-
-Otherwise instances with a large number of queues take forever to load
-and display (such as rt.cpan.org).
----
- share/html/Admin/Queues/index.html | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
-index 7f26702..2092230 100644
---- a/share/html/Admin/Queues/index.html
-+++ b/share/html/Admin/Queues/index.html
-@@ -58,6 +58,7 @@
- <& /Elements/CollectionList,
-     OrderBy => 'Name',
-     Order => 'ASC',
-+    Rows => 50,
-     %ARGS,
-     Format => $Format,
-     Collection => $queues,
--- 
-1.8.2.2
-
diff --git a/patches/4.0.15-avoid-linking-punctuation.patch b/patches/4.0.15-avoid-linking-punctuation.patch
deleted file mode 100644
index 3af234f..0000000
--- a/patches/4.0.15-avoid-linking-punctuation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2c8ed76665d5536df7d76bdb10a7f2dee92b8082 Mon Sep 17 00:00:00 2001
-From: Thomas Sibley <trs at bestpractical.com>
-Date: Mon, 22 Jul 2013 22:29:13 -0700
-Subject: [PATCH] Avoid linking trailing punctuation and HTML in MakeClicky
-
----
- share/html/Elements/MakeClicky | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/share/html/Elements/MakeClicky b/share/html/Elements/MakeClicky
-index dabe3bb..854c93c 100644
---- a/share/html/Elements/MakeClicky
-+++ b/share/html/Elements/MakeClicky
-@@ -76,12 +76,12 @@ my %actions = (
- my @types = (
-     {
-         name   => "httpurl",
--        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?/,
-+        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#[^\s<]+)?(?<![.?!,;:])/,
-         action => "url",
-     },
-     {
-         name   => "httpurl_overwrite",
--        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?/,
-+        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#[^\s<]+)?(?<![.?!,;:])/,
-         action => "url_overwrite",
-     },
- );
--- 
-1.8.3.2
-

-----------------------------------------------------------------------