diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-01 14:35:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-01 14:35:46 +0000 |
| commit | 8028a59d7a89ca803902b5b5a206bcf1e83e8c51 (patch) | |
| tree | c8bca02c1b8e2a8e070431a847d640f866f22699 /lib/api/api.rb | |
| parent | d7a3f875d13b8d4a599a61232938f762d9c5e735 (diff) | |
| parent | a612bd070862097893103c4babc63df9ad45b214 (diff) | |
| download | gitlab-ce-8028a59d7a89ca803902b5b5a206bcf1e83e8c51.tar.gz | |
Merge branch '51913-api-getting-projects-for-users-with-dot-gets-404' into 'master'
API: Support username with dots
Closes #51913
See merge request gitlab-org/gitlab-ce!24395
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 2b42e377c74..9cbfc0e35ff 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -9,6 +9,7 @@ module API NO_SLASH_URL_PART_REGEX = %r{[^/]+} NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze COMMIT_ENDPOINT_REQUIREMENTS = NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze + USER_REQUIREMENTS = { user_id: NO_SLASH_URL_PART_REGEX }.freeze insert_before Grape::Middleware::Error, GrapeLogging::Middleware::RequestLogger, |