Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-05-25 09:18:42 +0300
committerMark Chao <mchao@gitlab.com>2018-06-06 15:01:44 +0300
commit15469fe0a1625449d4bb27208b444e3c72afaaa0 (patch)
tree3fee4baebf632633547f11a809940775f470e6b3 /doc/security
parent8c24e78b999263b177e40d363699b4dd60c16782 (diff)
doc
Diffstat (limited to 'doc/security')
-rw-r--r--doc/security/information_exclusivity.md2
-rw-r--r--doc/security/webhooks.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/security/information_exclusivity.md b/doc/security/information_exclusivity.md
index f8e7fc3fd0e..22756232025 100644
--- a/doc/security/information_exclusivity.md
+++ b/doc/security/information_exclusivity.md
@@ -2,7 +2,7 @@
Git is a distributed version control system (DVCS).
This means that everyone that works with the source code has a local copy of the complete repository.
-In GitLab every project member that is not a guest (so reporters, developers and masters) can clone the repository to get a local copy.
+In GitLab every project member that is not a guest (so reporters, developers and maintainers) can clone the repository to get a local copy.
After obtaining this local copy the user can upload the full repository anywhere, including another project under their control or another server.
The consequence is that you can't build access controls that prevent the intentional sharing of source code by users that have access to the source code.
This is an inherent feature of a DVCS and all git management systems have this limitation.
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index a573445ab5b..b17b0a4bc4a 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -2,7 +2,7 @@
If you have non-GitLab web services running on your GitLab server or within its local network, these may be vulnerable to exploitation via Webhooks.
-With [Webhooks](../user/project/integrations/webhooks.md), you and your project masters and owners can set up URLs to be triggered when specific things happen to projects. Normally, these requests are sent to external web services specifically set up for this purpose, that process the request and its attached data in some appropriate way.
+With [Webhooks](../user/project/integrations/webhooks.md), you and your project maintainers and owners can set up URLs to be triggered when specific things happen to projects. Normally, these requests are sent to external web services specifically set up for this purpose, that process the request and its attached data in some appropriate way.
Things get hairy, however, when a Webhook is set up with a URL that doesn't point to an external, but to an internal service, that may do something completely unintended when the webhook is triggered and the POST request is sent.