summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2017-02-27 22:39:53 +0100
committerDavid Lawrence <dkl@mozilla.com>2017-02-27 22:39:53 +0100
commite316d9661cd9e78e3ae8ffbd8d233623374d1f77 (patch)
tree1966f0ed500ff52911ee5e55bccb85f663bce884
parentfa169e6b50adc7242edf02b9edf4594a29186fd4 (diff)
downloadbugzilla-e316d9661cd9e78e3ae8ffbd8d233623374d1f77.tar.gz
bugzilla-e316d9661cd9e78e3ae8ffbd8d233623374d1f77.tar.xz
Bug 1341457 - Add Text::MultiMarkdown as a dependency and regenerate carton bundle
-rw-r--r--META.json17
-rw-r--r--META.yml9
-rw-r--r--Makefile.PL6
3 files changed, 27 insertions, 5 deletions
diff --git a/META.json b/META.json
index 2d6c64b35..7a3080a1a 100644
--- a/META.json
+++ b/META.json
@@ -3,8 +3,8 @@
"author" : [
"Bugzilla Developers <developers@bugzilla.org>"
],
- "dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005",
+ "dynamic_config" : 0,
+ "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010",
"license" : [
"unknown"
],
@@ -88,6 +88,7 @@
"Search::Elasticsearch" : "0",
"Template::Plugin::GD::Image" : "0",
"Test::Taint" : "1.06",
+ "Text::MultiMarkdown" : "1.000034",
"TheSchwartz" : "1.10",
"Type::Tiny" : "1",
"URI::Escape" : "0",
@@ -232,6 +233,16 @@
}
}
},
+ "markdown" : {
+ "description" : "Markdown syntax support for comments",
+ "prereqs" : {
+ "runtime" : {
+ "requires" : {
+ "Text::MultiMarkdown" : "1.000034"
+ }
+ }
+ }
+ },
"memcached" : {
"description" : "Memcached Support",
"prereqs" : {
@@ -484,5 +495,5 @@
},
"release_status" : "stable",
"version" : "42",
- "x_serialization_backend" : "JSON::PP version 2.27300"
+ "x_serialization_backend" : "JSON::PP version 2.27400"
}
diff --git a/META.yml b/META.yml
index 0c0409554..84e927c30 100644
--- a/META.yml
+++ b/META.yml
@@ -9,8 +9,8 @@ build_requires:
Test::WWW::Selenium: '0'
configure_requires:
ExtUtils::MakeMaker: 6.57_07
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005'
+dynamic_config: 0
+generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010'
license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -69,6 +69,7 @@ optional_features:
Search::Elasticsearch: '0'
Template::Plugin::GD::Image: '0'
Test::Taint: '1.06'
+ Text::MultiMarkdown: '1.000034'
TheSchwartz: '1.10'
Type::Tiny: '1'
URI::Escape: '0'
@@ -136,6 +137,10 @@ optional_features:
description: 'Linux::PID for MozReview'
requires:
Linux::Pid: '0'
+ markdown:
+ description: 'Markdown syntax support for comments'
+ requires:
+ Text::MultiMarkdown: '1.000034'
memcached:
description: 'Memcached Support'
requires:
diff --git a/Makefile.PL b/Makefile.PL
index 0e761e4c7..14062e872 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -121,6 +121,12 @@ my %optional_features = (
}
}
},
+ markdown => {
+ description => 'Markdown syntax support for comments',
+ prereqs => {
+ runtime => { requires => { 'Text::MultiMarkdown' => '1.000034' } }
+ }
+ },
pg => {
prereqs => { runtime => { requires => { 'DBD::Pg' => 'v2.19.3' } } },
description => 'Postgres database support'