[gtk: 2/2] Merge branch 'ebassi/ci-docs' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0d6bbc035d34830b35f69d75ed992a1b5db21ac7
Merge: 5d0a3bd4cb ed412f43d1
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 9 12:35:49 2021 +0000

    Merge branch 'ebassi/ci-docs' into 'master'
    
    ci: Drop the split Fedora images
    
    See merge request GNOME/gtk!3415

 .gitlab-ci.yml                    |  4 +-
 .gitlab-ci/fedora-base.Dockerfile | 89 ------------------------------------
 .gitlab-ci/fedora-docs.Dockerfile | 18 --------
 .gitlab-ci/fedora.Dockerfile      | 94 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 95 insertions(+), 110 deletions(-)
---