diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 16:58:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 16:58:28 +0000 |
| commit | 307aa730b120b00456b330195af11a7af25bba19 (patch) | |
| tree | 703a2224ba58507c70094b990b16e45f8b96fa90 | |
| parent | 57daaa163e572dc89f177fcf0023476d3ad19cc9 (diff) | |
| download | gitlab-ce-307aa730b120b00456b330195af11a7af25bba19.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
| -rw-r--r-- | changelogs/unreleased/216345-extend-project-group-membership-checks-to-group-ancestors.yml | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
3 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/216345-extend-project-group-membership-checks-to-group-ancestors.yml b/changelogs/unreleased/216345-extend-project-group-membership-checks-to-group-ancestors.yml new file mode 100644 index 00000000000..536ccb83cd4 --- /dev/null +++ b/changelogs/unreleased/216345-extend-project-group-membership-checks-to-group-ancestors.yml @@ -0,0 +1,5 @@ +--- +title: Consider project group and group ancestors when processing CODEOWNERS entries +merge_request: 31804 +author: +type: added diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |