From d5600649f122771670c5c9548d48c26afb594118 Mon Sep 17 00:00:00 2001
From: Mustafa Ozhan <mr.mustafa.ozhan@gmail.com>
Date: Sat, 25 Nov 2023 21:55:49 +0100
Subject: [PATCH] [Oztechan/Global#28] Fix issue mapping and repository mapping
 (#30)

* [Oztechan/Global#23] Use File Sync templates for the repo names

* [Oztechan/Global#23] Use File Sync templates for the repo names

* [Oztechan/Global#25] Integrate SubMob repositories into Global

* [Oztechan/Global#25] Integrate SubMob repositories into Global

* [Oztechan/Global#25] Integrate SubMob repositories into Global

* [Oztechan/Global#28] Fix issue mapping and repository mapping

* [Oztechan/Global#28] Fix issue mapping and repository mapping

* [Oztechan/Global#28] Fix issue mapping and repository mapping
---
 .github/sync.yml              | 23 ++++++++++++-----------
 docs/CONTRIBUTING.md          |  8 ++++----
 docs/PULL_REQUEST_TEMPLATE.md |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/sync.yml b/.github/sync.yml
index 31c5a79..94c8751 100644
--- a/.github/sync.yml
+++ b/.github/sync.yml
@@ -55,36 +55,37 @@ Oztechan/TraceFit:
         name: 'TraceFit'
         owner: "Oztechan"
 
-Oztechan/BaseMob:
+Oztechan/actions:
   - source: docs/
     template:
       repository:
-        name: 'BaseMob'
-        owner: "SubMob"
+        name: 'actions'
+        owner: "Oztechan"
 
-Oztechan/ScopeMob:
+SubMob/BaseMob:
   - source: docs/
     template:
       repository:
-        name: 'ScopeMob'
+        name: 'BaseMob'
         owner: "SubMob"
 
-Oztechan/LogMob:
+SubMob/ScopeMob:
   - source: docs/
     template:
       repository:
-        name: 'LogMob'
+        name: 'ScopeMob'
         owner: "SubMob"
 
-Oztechan/ParserMob:
+SubMob/LogMob:
   - source: docs/
     template:
       repository:
-        name: 'ParserMob'
+        name: 'LogMob'
         owner: "SubMob"
 
-Oztechan/actions:
+SubMob/ParserMob:
   - source: docs/
     template:
       repository:
-        name: 'actions'
\ No newline at end of file
+        name: 'ParserMob'
+        owner: "SubMob"
\ No newline at end of file
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 4114ee6..8c97e35 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Every commit message should match the following format `[{{ repository.owner }}/
 Example:
 
 ```
-[Oztechan/Global#123] My cool feature
+[{{ repository.owner }}/{{ repository.name }}#ISSUE_ID] My cool feature
 ```
 
 ## Pull Request
@@ -33,17 +33,17 @@ Pull Request title should follow below format:
 Example:
 
 ```
-[Oztechan/Global#123] Whatever the name of ticket is
+[{{ repository.owner }}/{{ repository.name }}#ISSUE_ID] Whatever the name of ticket is
 ```
 
 ### Description
 
-Description has to have `Resloves {{ repository.owner }}/{{ repository.name }}#ISSUE_ID` with relevant issue. It will help automatically close relevant issue once the PR is merged.
+Description has to have `Resolves {{ repository.owner }}/{{ repository.name }}#ISSUE_ID` with relevant issue. It will help automatically close relevant issue once the PR is merged.
 
 Example:
 
 ```
-Resolves Oztechan/Global#123
+Resolves {{ repository.owner }}/{{ repository.name }}#123
 
 Some description.
 ```
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index 7e3ea40..79e0ec6 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 Resolves {{ repository.owner }}/{{ repository.name }}#ISSUE_ID
 <!--
 Pull Request Checklist
-1. I have read the https://github.com/Oztechan/Global/blob/develop/docs/CONTRIBUTING.md
+1. I have read the https://github.com/{{ repository.owner }}/{{ repository.name }}/blob/develop/docs/CONTRIBUTING.md
 2. PR title in the format of `[{{ repository.owner }}/{{ repository.name }}#ISSUE_ID] ISSUE_TITLE`
 3. I have added a valid description and 
 4. I replaced `ISSUE_ID` with the ID(number in the link) of issue.