From 1357e47f92d2929e7c174684fece89109b467354 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 4 Nov 2023 12:36:18 +0100 Subject: [PATCH] Re-create 6.6.7 release including GitLab fix. This reverts commit 01134d4625b0c5eec9b255158116e9e018d51dba. --- CHANGELOG.rst | 4 ++++ changelogs/changelog.yaml | 8 ++++++++ changelogs/fragments/7467-fix-gitlab-constants-calls.yml | 5 ----- 3 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 changelogs/fragments/7467-fix-gitlab-constants-calls.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 782d43d244..e47bfa9a39 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -22,6 +22,10 @@ Bugfixes - composer - fix impossible to run ``working_dir`` dependent commands. The module was throwing an error when trying to run a ``working_dir`` dependent command, because it tried to get the command help without passing the ``working_dir`` (https://github.com/ansible-collections/community.general/issues/3787). - github_deploy_key - fix pagination behaviour causing a crash when only a single page of deploy keys exist (https://github.com/ansible-collections/community.general/pull/7375). +- gitlab_group_members - fix gitlab constants call in ``gitlab_group_members`` module (https://github.com/ansible-collections/community.general/issues/7467). +- gitlab_project_members - fix gitlab constants call in ``gitlab_project_members`` module (https://github.com/ansible-collections/community.general/issues/7467). +- gitlab_protected_branches - fix gitlab constants call in ``gitlab_protected_branches`` module (https://github.com/ansible-collections/community.general/issues/7467). +- gitlab_user - fix gitlab constants call in ``gitlab_user`` module (https://github.com/ansible-collections/community.general/issues/7467). - lxc connection plugin - properly evaluate options (https://github.com/ansible-collections/community.general/pull/7369). - memset module utils - make compatible with ansible-core 2.17 (https://github.com/ansible-collections/community.general/pull/7379). - redhat_subscription - use the right D-Bus options for the consumer type when diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 20b9a2d53f..2cc0ee8484 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -1582,6 +1582,13 @@ releases: (https://github.com/ansible-collections/community.general/issues/3787). - github_deploy_key - fix pagination behaviour causing a crash when only a single page of deploy keys exist (https://github.com/ansible-collections/community.general/pull/7375). + - gitlab_group_members - fix gitlab constants call in ``gitlab_group_members`` + module (https://github.com/ansible-collections/community.general/issues/7467). + - gitlab_project_members - fix gitlab constants call in ``gitlab_project_members`` + module (https://github.com/ansible-collections/community.general/issues/7467). + - gitlab_protected_branches - fix gitlab constants call in ``gitlab_protected_branches`` + module (https://github.com/ansible-collections/community.general/issues/7467). + - gitlab_user - fix gitlab constants call in ``gitlab_user`` module (https://github.com/ansible-collections/community.general/issues/7467). - lxc connection plugin - properly evaluate options (https://github.com/ansible-collections/community.general/pull/7369). - memset module utils - make compatible with ansible-core 2.17 (https://github.com/ansible-collections/community.general/pull/7379). - 'redhat_subscription - use the right D-Bus options for the consumer type when @@ -1610,4 +1617,5 @@ releases: - 7375-fix-github-deploy-key-pagination.yml - 7378-redhat_subscription-dbus-consumer-type.yaml - 7379-url.yml + - 7467-fix-gitlab-constants-calls.yml release_date: '2023-11-04' diff --git a/changelogs/fragments/7467-fix-gitlab-constants-calls.yml b/changelogs/fragments/7467-fix-gitlab-constants-calls.yml deleted file mode 100644 index 77466f75e6..0000000000 --- a/changelogs/fragments/7467-fix-gitlab-constants-calls.yml +++ /dev/null @@ -1,5 +0,0 @@ -bugfixes: - - gitlab_group_members - fix gitlab constants call in ``gitlab_group_members`` module (https://github.com/ansible-collections/community.general/issues/7467). - - gitlab_project_members - fix gitlab constants call in ``gitlab_project_members`` module (https://github.com/ansible-collections/community.general/issues/7467). - - gitlab_protected_branches - fix gitlab constants call in ``gitlab_protected_branches`` module (https://github.com/ansible-collections/community.general/issues/7467). - - gitlab_user - fix gitlab constants call in ``gitlab_user`` module (https://github.com/ansible-collections/community.general/issues/7467).