From e238882d0c18c75b41b71f05ce44f5717fc75b4d Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Mon, 19 Nov 2018 22:51:54 +0900 Subject: Eliminate duplicated words Signed-off-by: Takuya Noguchi --- doc/development/ee_features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/development/ee_features.md') diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 9aea03139ee..a227e2f6640 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 -- cgit v1.2.1 From b1e070bf4957a558ac51315dd4a6277056047e8a Mon Sep 17 00:00:00 2001 From: Imre Farkas Date: Thu, 8 Nov 2018 13:18:17 +0100 Subject: Fix API::Namespaces to accept namepaces with dots It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS --- doc/development/ee_features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/development/ee_features.md') diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index a227e2f6640..790b1bf951b 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -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 -- cgit v1.2.1