[gjs: 2/2] Merge branch 'flatpak' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit bd54fb0c2f5a9770cb6a09dd6dcb75f820f40b35
Merge: c7c20c4b 917160bf
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun May 6 19:47:40 2018 +0000

    Merge branch 'flatpak' into 'master'
    
    Create a flatpak inside CI
    
    Closes #153
    
    See merge request GNOME/gjs!135

 .gitlab-ci.yml               | 24 ++++++++++++++++++++++--
 test/org.gnome.GjsDevel.json | 32 ++++++++++++++++++++++++++++++++
 test/test-ci.sh              | 14 ++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
---