[gjs: 7/7] Merge branch 'may-maintenance' into 'master'
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 7/7] Merge branch 'may-maintenance' into 'master'
- Date: Wed, 9 Jun 2021 05:17:32 +0000 (UTC)
commit 004943b2ee783ddf0c32a8ab3c90d26f85a8594c
Merge: 481ea3ed 549cce14
Author: Philip Chimento <philip chimento gmail com>
Date: Wed Jun 9 05:17:31 2021 +0000
Merge branch 'may-maintenance' into 'master'
May maintenance
See merge request GNOME/gjs!630
.eslintrc.yml | 1 +
.gitlab-ci.yml | 2 +-
gjs/gjs_pch.hh | 1 +
gjs/jsapi-util-string.cpp | 8 ++++++--
installed-tests/js/testFundamental.js | 12 +++++------
installed-tests/js/testGIMarshalling.js | 2 +-
installed-tests/js/testGObjectClass.js | 6 +++---
meson.build | 2 +-
modules/esm/gettext.js | 2 ++
test/extra/Dockerfile | 2 +-
test/extra/Dockerfile.debug | 4 ++--
test/gjs-tests.cpp | 36 +++++++++++++++++++++++++++++++++
tools/yarn.lock | 6 +++---
13 files changed, 64 insertions(+), 20 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]