diff options
| author | David Lawrence <dkl@mozilla.com> | 2014-11-04 21:46:41 +0000 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-11-04 21:46:41 +0000 |
| commit | f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f (patch) | |
| tree | b95c7e398739df2b8447d93a32a1b10f2c9fc2e7 /template/en/default/global | |
| parent | fc62fd4082c76068c2062f4e50b88c0908db2be2 (diff) | |
| download | bugs-f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f.tar bugs-f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f.tar.gz bugs-f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f.tar.bz2 bugs-f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f.tar.xz bugs-f5fc4a6d6bf930607d8dd5cd7ffeb78a1044918f.zip | |
Revert Bug 330707 - Add optional support for MarkDown
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index ac99094c5..6e3358782 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -44,8 +44,7 @@ "requestee_cc" => "Automatically add me to the CC list of $terms.bugs I am requested to review", "bugmail_new_prefix" => "Add 'New:' to subject line of email sent when a new $terms.bug is filed", "possible_duplicates" => "Display possible duplicates when reporting a new $terms.bug", - "use_markdown" => "Enable Markdown support for $terms.comments" - } + } %] [% Hook.process('settings') %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index e9bdb63c4..a0ae25c08 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1181,9 +1181,6 @@ [%# Used for non-web-based LOGIN_REQUIRED situations. %] You must log in before using this part of [% terms.Bugzilla %]. - [% ELSIF error == "markdown_disabled" %] - Markdown feature is not enabled. - [% ELSIF error == "migrate_config_created" %] The file <kbd>[% file FILTER html %]</kbd> contains configuration variables that must be set before continuing with the migration. |