Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mattermost/mattermost-plugin-jira…
Browse files Browse the repository at this point in the history
… into MM-604
  • Loading branch information
Kshitij-Katiyar committed Nov 12, 2024
2 parents 95c0b90 + dc1f1e2 commit 938d2d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ apply:
## Install go tools
install-go-tools:
@echo Installing go tools
$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.1
$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.0
$(GO) install gotest.tools/[email protected]

## Runs eslint and golangci-lint
Expand Down
4 changes: 3 additions & 1 deletion server/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ const commonHelpText = "\n" +
""

const sysAdminHelpText = "\n###### For System Administrators:\n" +
"Setup Jira plugin\n" +
"* `/jira setup` - Start Jira plugin setup flow\n" +
"* `/jira webhook [jiraURL]` - Display the webhook URLs to setup on Jira\n" +
"Install Jira instances:\n" +
"* `/jira instance install server [jiraURL]` - Connect Mattermost to a Jira Server or Data Center instance located at <jiraURL>\n" +
"* `/jira instance install cloud-oauth [jiraURL]` - Connect Mattermost to a Jira Cloud instance using OAuth 2.0 located at <jiraURL>\n" +
Expand All @@ -94,7 +97,6 @@ const sysAdminHelpText = "\n###### For System Administrators:\n" +
"* `/jira instance alias [URL] [alias-name]` - assign an alias to an instance\n" +
"* `/jira instance unalias [alias-name]` - remve an alias from an instance\n" +
"* `/jira instance v2 <jiraURL>` - Set the Jira instance to process \"v2\" webhooks and subscriptions (not prefixed with the instance ID)\n" +
"* `/jira webhook [--instance=<jiraURL>]` - Show the Mattermost webhook to receive JQL queries\n" +
"* `/jira v2revert ` - Revert to V2 jira plugin data model\n" +
""

Expand Down

0 comments on commit 938d2d7

Please sign in to comment.