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
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-17 10:29:57 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-17 10:29:57 +0300
commitda3d35952d5b106a3e507244b2ac649a082652b6 (patch)
tree40c263ec388afd7fe2155f4cb3ea0aa6dc69f014 /lib
parentefa90d0a14805d48a0693cbd5f05bbe008ee6b6e (diff)
parentd241c6d057798dfbdb6d69e74f82e1ad1848805b (diff)
Merge branch 'restrict-user-api-integers' into 'master'
Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
Diffstat (limited to 'lib')
-rw-r--r--lib/api/users.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index ee29f952246..813cc379e43 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -3,7 +3,7 @@ module API
class Users < Grape::API
before { authenticate! }
- resource :users do
+ resource :users, requirements: { uid: /[0-9]*/, id: /[0-9]*/ } do
# Get a users list
#
# Example Request: