UI fixes on organisation pages

Author: AceHunterr

.github/workflows/merge-conflict-check.yml

@@ -0,0 +1,65 @@
+name: Merge Conflict Check Workflow
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  Merge-Conflict-Check:
+    name: Check for Merge Conflicts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Check Mergeable Status via Github API
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+            PR_NUMBER=${{ github.event.pull_request.number }}
+            max_retries=3
+            retry_delay=5
+
+            for ((i=1; i<=max_retries; i++)); do
+              echo "Attempt $i of $max_retries"
+
+              if ! response=$(gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" --jq '.mergeable'); then
+                if [[ $response == *"rate limit exceeded"* ]]; then
+                  echo "Rate limit exceeded. Waiting before retry..."
+                  sleep 60  # Wait longer for rate limit
+                else
+                  echo "Failed to call GitHub API: $response"
+                  if [ $i -eq $max_retries ]; then
+                    echo "Maximum retries reached. Exiting."
+                    exit 1
+                  fi
+                  sleep $retry_delay
+                fi
+                continue
+              fi
+              
+              case "$response" in
+                "true")
+                  echo "No conflicts detected."
+                  exit 0
+                  ;;
+                "false")
+                  echo "Merge conflicts detected."
+                  exit 1
+                  ;;
+                *)
+                  echo "Mergeable status unknown: $response"
+                  if [ $i -eq $max_retries ]; then
+                    echo "Maximum retries reached. Exiting."
+                    exit 1
+                  fi
+                  sleep $retry_delay
+                  ;;
+              esac
+            done

.github/workflows/pull-request.yml

@@ -437,7 +437,7 @@ jobs:
     name: Validate CodeRabbit Approval
     runs-on: ubuntu-latest
     if: github.actor != 'dependabot[bot]'
-    needs: [Code-Quality-Checks, Test-Application, Start-App-Without-Docker, Docker-Start-Check]
+    needs: [Test-Docusaurus-Deployment]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/scripts/validate-coderabbit.sh

@@ -32,7 +32,7 @@ else
   echo "   of the PR web page, add a comment with the"
   echo "   statement below to restart a review"
   echo ""
-  echo "@coderabbitai full review"
+  echo "   @coderabbitai full review"
   echo ""  
   exit 1
 fi

.github/workflows/stale.yml

@@ -13,17 +13,16 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+  - cron: "0 * * * *"
 
 permissions:
   issues: write
   pull-requests: write  
 
 jobs:
   stale:
-
+    name: Process Stale Issues and PRs 
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/stale@v9
       with:

3141

@@ -1,2 +1,2 @@
 /.github/ @palisadoes
-CODEOWNERS @palisadoes
+# CODEOWNERS @palisadoes