[d-feet: 6/6] Merge branch 'fix-bugs-in-mr-7' into 'master'

[Thomas Bechtold <toabctl src gnome org>]

commit b512c7fc3e339f02fce5aee988fc7c0da135c5c5
Merge: d6e71ef ee9c5aa
Author: Thomas Bechtold <thomasbechtold jpberlin de>
Date:   Thu Sep 20 05:12:24 2018 +0000

    Merge branch 'fix-bugs-in-mr-7' into 'master'
    
    Fix bugs introduced in MR 7
    
    See merge request GNOME/d-feet!9

 .gitlab-ci.yml        | 13 +++++++------
 org.gnome.dfeet.json  | 20 ++++++++++++++++++++
 src/dfeet/settings.py |  2 +-
 src/tests/tests.py.in | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 7 deletions(-)
---