From a71e085b2314acd764bd9883dd236998e2f9cd4c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 5 Oct 2020 21:03:15 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- doc/api/graphql/reference/gitlab_schema.graphql | 2 +- doc/api/graphql/reference/gitlab_schema.json | 2 +- vendor/gitignore/C++.gitignore | 0 vendor/gitignore/Java.gitignore | 0 4 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 vendor/gitignore/C++.gitignore mode change 100644 => 100755 vendor/gitignore/Java.gitignore 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 old mode 100644 new mode 100755 diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore old mode 100644 new mode 100755 -- cgit v1.2.3