[gjs: 3/3] Merge branch 'final' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 82a161bfda291273186bd15e4280c01e39e55ec2
Merge: 4f46b348 80953eca
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Feb 1 04:45:43 2018 +0000

    Merge branch 'final' into 'master'
    
    Use devel docker images on CI
    
    See merge request GNOME/gjs!54

 .gitlab-ci.yml                             | 40 +++++++++++++++++---------
 installed-tests/scripts/testCommandLine.sh | 18 ++++++------
 test/extra/do_basic.sh                     | 24 ++++++++++++----
 test/extra/do_docker.sh                    | 25 ++++++++++++++++
 test/test-ci.sh                            | 46 +++++++-----------------------
 5 files changed, 91 insertions(+), 62 deletions(-)
---