Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

.github/workflows/lint-and-analyse-php.yml

@@ -11,6 +11,7 @@ on:
 jobs:
     lint-node:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
@@ -35,6 +36,7 @@ jobs:
 
     lint-php-files:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - name: Lint PHP files
@@ -68,6 +70,7 @@ jobs:
 
     analyse-php:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - name: Use php 7.2

.github/workflows/lint-docs.yml

@@ -11,6 +11,7 @@ on:
 jobs:
     lint-docs:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - name: Lint phpdoc blocks

.github/workflows/other-tools.yml

@@ -11,6 +11,7 @@ on:
 jobs:
     build-documentation:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-python@v2
@@ -23,6 +24,7 @@ jobs:
 
     build-release:
         runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         steps:
             - uses: actions/checkout@v2
             - name: Use php 7.1

.github/workflows/tests.yml

@@ -11,6 +11,7 @@ on:
 jobs:
     test-php:
         name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }}
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
@@ -64,6 +65,7 @@ jobs:
     test-php-dbase:
         name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         strategy:
             matrix:
                 php-version: ["7.1"]
@@ -112,6 +114,7 @@ jobs:
     test-php-recode:
         name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         strategy:
             matrix:
                 php-version: ["7.1"]
@@ -160,6 +163,7 @@ jobs:
     test-php-random:
         name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
+        if: "!contains(github.event.head_commit.message, '[ci skip]')"
         strategy:
             matrix:
                 php-version: ["7.4"]

.travis.yml

@@ -49,12 +49,12 @@ jobs:
       node_js: 10
       before_install:
         - export PATH="/usr/local/opt/gettext/bin:$PATH"
-        - echo "memory_limit=-1" > /usr/local/etc/php/7.4/conf.d/50-travis.ini
-        - echo "pcre.jit=0" >> /usr/local/etc/php/7.4/conf.d/50-travis.ini
+        - echo "memory_limit=-1" > /usr/local/etc/php/8.0/conf.d/50-travis.ini
+        - echo "pcre.jit=0" >> /usr/local/etc/php/8.0/conf.d/50-travis.ini
       addons:
         homebrew:
           packages:
-            - php
+            - php@8.0
             - composer
           update: true
 

ChangeLog

@@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
 - issue #16565 Added 'IF EXISTS' to 'DROP EVENT' when updating events to avoid replication issues
 - issue        Removed metro fonts that where Apache-2.0 files that are incompatible with GPL-2.0
 - issue #16464 Made the relation view default to the current database when creating relations
+- issue #16463 Fixed 'REFERENCES' privilege checkbox's title on new MySQL versions and on MariaDB
 
 5.0.5 (not yet released)
 - issue #14494 Fix uncaught TypeError when editing partitioning