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

[Philip Chimento <pchimento src gnome org>]

commit 71fa9aabcd6d67d859809edc6654a73ce3334e7f
Merge: ccf1ec9 345932b
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Mar 27 23:05:52 2018 +0000

    Merge branch 'disableX' into 'master'
    
    Test when no graphics is available
    
    Closes #135
    
    See merge request GNOME/gjs!109

 .gitlab-ci.yml   | 43 +++++++++++++++++++++++++++++++------------
 Makefile-test.am | 25 +++++++++++++------------
 2 files changed, 44 insertions(+), 24 deletions(-)
---