diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 91a68b5711d..5af59e7a6d2 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8692 \ No newline at end of file +8693 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install.pm b/mozilla/webtools/bugzilla/Bugzilla/Install.pm index 258adf8114d..41f88d70b32 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Install.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Install.pm @@ -87,6 +87,8 @@ sub SETTINGS { requestee_cc => { options => ['on', 'off'], default => 'on' }, # 2012-04-30 glob@mozilla.com -- Bug 663747 bugmail_new_prefix => { options => ['on', 'off'], default => 'on' }, + # 2013-07-26 joshi_sunil@in.com -- Bug 669535 + possible_duplicates => { options => ['on', 'off'], default => 'on' }, } }; diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl index 9c7775f0784..66c5dfff96c 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl @@ -491,7 +491,8 @@ TUI_hide_default('attachment_text_field'); - [% IF feature_enabled('jsonrpc') AND !cloned_bug_id %] + [% IF feature_enabled('jsonrpc') AND !cloned_bug_id + AND user.settings.possible_duplicates.value == 'on' %] Possible
Duplicates: diff --git a/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl index d20068306a5..6e335878278 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl @@ -43,6 +43,7 @@ "text_only" => "Text Only", "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", } %]