diff options
author | Andrew Janke <andrew@apjanke.net> | 2015-06-15 16:55:25 -0400 |
---|---|---|
committer | Andrew Janke <andrew@apjanke.net> | 2015-06-15 16:55:25 -0400 |
commit | d0670aa2bd5186357961dd90c4a97c2c3842f728 (patch) | |
tree | e593b128959a48dc7568df889eb484d75d8be576 /plugins/jira | |
parent | ab18795f3cd9bd45aec60a4a4bd8ecf820eb86c4 (diff) | |
download | zsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.tar.gz zsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.tar.bz2 zsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.zip |
Fix merge conflict for jira-prefix and jira add comment
Diffstat (limited to 'plugins/jira')
-rw-r--r-- | plugins/jira/jira.plugin.zsh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh index 8ad60b8fe..ca540c84c 100644 --- a/plugins/jira/jira.plugin.zsh +++ b/plugins/jira/jira.plugin.zsh @@ -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 } |