summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Field.pm7
-rw-r--r--Bugzilla/User.pm4
2 files changed, 5 insertions, 6 deletions
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 5529a53f0..c6c889957 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -129,9 +129,8 @@ use constant DEFAULT_FIELDS => (
{name => 'votes', desc => 'Votes'},
{name => 'qa_contact', desc => 'QAContact', in_new_bugmail => 1},
{name => 'cc', desc => 'CC', in_new_bugmail => 1},
- {name => 'dependson', desc => 'BugsThisDependsOn', in_new_bugmail => 1},
- {name => 'blocked', desc => 'OtherBugsDependingOnThis',
- in_new_bugmail => 1},
+ {name => 'dependson', desc => 'Depends on', in_new_bugmail => 1},
+ {name => 'blocked', desc => 'Blocks', in_new_bugmail => 1},
{name => 'attachments.description', desc => 'Attachment description'},
{name => 'attachments.filename', desc => 'Attachment filename'},
@@ -472,7 +471,7 @@ sub populate_field_definitions {
print "New field name: " . $new_field_name . "\n";
$dbh->do('UPDATE fielddefs SET name = ? WHERE id = ?',
undef, ($new_field_name, $old_field_id));
-}
+ }
# This field has to be created separately, or the above upgrade code
# might not run properly.
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c83732ecc..6039e3fe6 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1157,8 +1157,8 @@ our %names_to_events = (
'Attachment description' => EVT_ATTACHMENT_DATA,
'Attachment mime type' => EVT_ATTACHMENT_DATA,
'Attachment is patch' => EVT_ATTACHMENT_DATA,
- 'BugsThisDependsOn' => EVT_DEPEND_BLOCK,
- 'OtherBugsDependingOnThis' => EVT_DEPEND_BLOCK);
+ 'Depends on' => EVT_DEPEND_BLOCK,
+ 'Blocks' => EVT_DEPEND_BLOCK);
# Returns true if the user wants mail for a given bug change.
# Note: the "+" signs before the constants suppress bareword quoting.