diff options
| author | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 16:48:26 +0200 |
|---|---|---|
| committer | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 16:48:26 +0200 |
| commit | dfc54352c001e8544972c3d40bfc82e55a11c6a0 (patch) | |
| tree | 6f108bc06cef6db48bdc5fe09f50749c2e49b456 /doc/development/ee_features.md | |
| parent | d0daa1591b7e4dc8cf5ba787420d09cb7e76d8d7 (diff) | |
| parent | 56936cd89838d85f038a6f25bb3033f8fa7a0ee1 (diff) | |
| download | gitlab-ce-dfc54352c001e8544972c3d40bfc82e55a11c6a0.tar.gz | |
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
Diffstat (limited to 'doc/development/ee_features.md')
| -rw-r--r-- | doc/development/ee_features.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 9aea03139ee..790b1bf951b 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -419,7 +419,7 @@ view. For instance the approval code in the project's settings page. **Mitigations** Blocks of code that are EE-specific should be moved to partials. This -avoids conflicts with big chunks of HAML code that that are not fun to +avoids conflicts with big chunks of HAML code that are not fun to resolve when you add the indentation to the equation. EE-specific views should be placed in `ee/app/views/`, using extra @@ -511,7 +511,7 @@ module EE params do requires :id, type: String, desc: 'The ID of a project' end - resource :projects, requirements: ::API::API::PROJECT_ENDPOINT_REQUIREMENTS do + resource :projects, requirements: ::API::API::NAMESPACE_OR_PROJECT_REQUIREMENTS do # ... end end |