[gjs: 3/3] Merge branch 'fix-debug-logging' into 'master'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 10715546832ad4205c423791f7eacb27df787839
Merge: b2a0c428 3120ecd1
Author: Cosimo Cecchi <cosimo cecchi gmail com>
Date:   Thu May 17 16:27:11 2018 +0000

    Merge branch 'fix-debug-logging' into 'master'
    
    Fix debug logging
    
    See merge request GNOME/gjs!148

 .gitlab-ci.yml            | 12 ++++++++++++
 gi/boxed.cpp              |  3 ++-
 gjs/jsapi-util-string.cpp | 13 ++++++++++---
 gjs/jsapi-util.h          |  2 ++
 4 files changed, 26 insertions(+), 4 deletions(-)
---