From 1926455a00b66dd931a17cafab4a1cb69946b09f Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Mon, 5 Jun 2023 20:12:08 +0800
Subject: [PATCH] Clean up at .github due to repo rename (#23580)

* update .github after repo rename

* update

* Update PULL_REQUEST_TEMPLATE.md

---------

Co-authored-by: M-ZubairAhmed <m-zubairahmed@protonmail.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .github/ISSUE_TEMPLATE.md                        | 2 +-
 .github/workflows/artifacts.yml                  | 2 +-
 .github/workflows/esrupgrade-common.yml          | 4 ++--
 .github/workflows/server-ci-template.yml         | 2 +-
 webapp/channels/.github/PULL_REQUEST_TEMPLATE.md | 9 ++++-----
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1d0fadecba..1fb6d5f863 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -7,7 +7,7 @@ If you've found a bug--something appears unintentional--please follow these step
 
 1. Confirm you’re filing a new issue. [Search existing tickets in Jira](https://mattermost.atlassian.net/jira/software/c/projects/MM/issues/) to ensure that the ticket does not already exist.
 2. Confirm your issue does not involve security. Otherwise, please see our [Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
-3. [File a new issue](https://github.com/mattermost/mattermost-server/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed. 
+3. [File a new issue](https://github.com/mattermost/mattermost/issues/new) using the format below. Mattermost will confirm steps to reproduce and file in Jira, or ask for more details if there is trouble reproducing it. If there's already an existing bug in Jira, it will be linked back to the GitHub issue so you can track when it gets fixed. 
 
 #### Summary
 Bug report in one concise sentence
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index ac36893725..8891e04b45 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -75,7 +75,7 @@ jobs:
       SENTRY_ORG: ${{ secrets.MM_SERVER_SENTRY_ORG }}
       SENTRY_PROJECT: ${{ secrets.MM_SERVER_SENTRY_PROJECT }}
     steps:
-      - name: cd/Checkout mattermost-server
+      - name: cd/Checkout mattermost project
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: cd/Create Sentry release
         uses: getsentry/action-release@85e0095193a153d57c458995f99d0afd81b9e5ea # v1.3.0
diff --git a/.github/workflows/esrupgrade-common.yml b/.github/workflows/esrupgrade-common.yml
index b4c4af7664..a4062c82d0 100644
--- a/.github/workflows/esrupgrade-common.yml
+++ b/.github/workflows/esrupgrade-common.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest-8-cores
     timeout-minutes: 30
     steps:
-      - name: Checkout mattermost-server
+      - name: Checkout mattermost project
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Run docker compose
         run: |
@@ -97,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest-8-cores
     timeout-minutes: 30
     steps:
-      - name: Checkout mattermost-server
+      - name: Checkout mattermost project
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Run docker compose
         run: |
diff --git a/.github/workflows/server-ci-template.yml b/.github/workflows/server-ci-template.yml
index b7a83c926e..20a6564227 100644
--- a/.github/workflows/server-ci-template.yml
+++ b/.github/workflows/server-ci-template.yml
@@ -147,7 +147,7 @@ jobs:
           cd ..
           git clone --depth=1 --no-single-branch https://github.com/mattermost/mattermost-api-reference.git
           cd mattermost-api-reference
-          echo "Trying to checkout the same branch on mattermost-api-reference as mattermost-server"
+          echo "Trying to checkout the same branch on mattermost-api-reference as mattermost"
           git checkout $GITHUB_HEAD_REF || git checkout $GITHUB_BASE_REF || true
           make build
           cd ../mattermost
diff --git a/webapp/channels/.github/PULL_REQUEST_TEMPLATE.md b/webapp/channels/.github/PULL_REQUEST_TEMPLATE.md
index 6451741204..4a40db6ba1 100644
--- a/webapp/channels/.github/PULL_REQUEST_TEMPLATE.md
+++ b/webapp/channels/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,16 +12,15 @@ A description of what this pull request does.
 
 #### Ticket Link
 <!--
-If this pull request addresses a Help Wanted ticket, please link the relevant GitHub issue, e.g.
+If applicable, please include both or either of the following links:
 
-Fixes https://github.com/mattermost/mattermost-server/issues/XXXXX
-
-Otherwise, link the JIRA ticket.
+Fixes https://github.com/mattermost/mattermost/issues/XXX
+Jira https://mattermost.atlassian.net/browse/MM-XXX
 -->
 
 #### Related Pull Requests
 <!--
-List all PRs related to resolving a ticket. For instance, if you submitted a PR to `mattermost/mattermost-server`, please include it here.
+List all PRs related to resolving a ticket. For instance, if you submitted a PR to `mattermost/mattermost`, please include it here.
 -->
 - Has server changes (please link here)
 - Has mobile changes (please link here)