Fix merge conflict for jira-prefix and jira add comment
This commit is contained in:
parent
ab18795f3c
commit
d0670aa2bd
|
@ -42,13 +42,6 @@ open_jira_issue () {
|
|||
$open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
|
||||
elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
|
||||
jira_query $@
|
||||
else
|
||||
echo "Opening issue #$1"
|
||||
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
|
||||
$open_cmd "$jira_url/issues/$jira_prefix$1"
|
||||
else
|
||||
$open_cmd "$jira_url/browse/$jira_prefix$1"
|
||||
fi
|
||||
else
|
||||
local addcomment=''
|
||||
if [[ "$2" == "m" ]]; then
|
||||
|
@ -59,9 +52,9 @@ open_jira_issue () {
|
|||
fi
|
||||
|
||||
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
|
||||
$open_cmd "$jira_url/issues/$1$addcomment"
|
||||
$open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
|
||||
else
|
||||
$open_cmd "$jira_url/browse/$1$addcomment"
|
||||
$open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue