diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 21:03:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 21:03:15 +0000 |
| commit | a71e085b2314acd764bd9883dd236998e2f9cd4c (patch) | |
| tree | eb69de459c9b21a198c18f5ea2fcefbaea9775d0 | |
| parent | 5049b3cd2362d119d0f6147bb45b449609b07cb4 (diff) | |
| download | gitlab-ce-a71e085b2314acd764bd9883dd236998e2f9cd4c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 2 | ||||
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 01d5044057a..7f5ff04bcee 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -6338,7 +6338,7 @@ type GeoNode { name: String """ - Package file registries of the GeoNode. Available only when feature flag `geo_package_file_replication` is enabled + Package file registries of the GeoNode """ packageFileRegistries( """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 6458a676612..173415ca164 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -17718,7 +17718,7 @@ }, { "name": "packageFileRegistries", - "description": "Package file registries of the GeoNode. Available only when feature flag `geo_package_file_replication` is enabled", + "description": "Package file registries of the GeoNode", "args": [ { "name": "ids", diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100644..100755 --- 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 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |