[gjs: 12/12] Merge branch 'august-maintenance' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 682d2e6b0c9e0c970794f3755422e2486d9f3abf
Merge: 0247b716 826d72bc
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Tue Aug 20 19:23:37 2019 +0000

    Merge branch 'august-maintenance' into 'master'
    
    August maintenance
    
    See merge request GNOME/gjs!333

 .gitlab-ci.yml                          | 96 +++++++--------------------------
 Makefile.am                             |  2 +-
 gi/object.cpp                           |  3 --
 gjs/context.cpp                         | 10 ++--
 gjs/engine.cpp                          |  6 ++-
 gjs/profiler.cpp                        |  7 +++
 installed-tests/scripts/testExamples.sh | 10 ++--
 modules/system.cpp                      |  3 ++
 test/extra/do_basic.sh                  |  4 +-
 test/test-ci.sh                         |  5 +-
 10 files changed, 55 insertions(+), 91 deletions(-)
---