summaryrefslogtreecommitdiff
path: root/doc/development/ee_features.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
commit4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch)
tree4b70c6b61345b2df075918cab6314d41b46cf80e /doc/development/ee_features.md
parent6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff)
downloadgitlab-ce-4560c92ab1954cf0416bafc45d1fa671fcacb3c3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/ee_features.md')
-rw-r--r--doc/development/ee_features.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index 2a5779d2fe3..b386d0e78ff 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -506,17 +506,17 @@ end
Note that due to namespace differences, we need to use the full qualifier for some
constants.
-#### EE params
+#### EE parameters
We can define `params` and utilize `use` in another `params` definition to
-include params defined in EE. However, we need to define the "interface" first
+include parameters defined in EE. However, we need to define the "interface" first
in CE in order for EE to override it. We don't have to do this in other places
due to `prepend_if_ee`, but Grape is complex internally and we couldn't easily
do that, so we'll follow regular object-oriented practices that we define the
interface first here.
-For example, suppose we have a few more optional params for EE. We can move the
-params out of the `Grape::API` class to a helper module, so we can inject it
+For example, suppose we have a few more optional parameters for EE. We can move the
+paramters out of the `Grape::API` class to a helper module, so we can inject it
before it would be used in the class.
```ruby