diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-19 18:26:15 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-12-19 18:26:15 +0800 |
commit | 4bf59f87b321d59de665a0100fed9114f4b747ea (patch) | |
tree | 548628a91be85631ac3b3bd8ec85c484ee70d707 /lib/api/users.rb | |
parent | e485b3f6ad3c220655e4aa909d93bca7a4ae6afc (diff) | |
parent | a50cd9eb4b4392004e47e57b2fa37c12def5827f (diff) | |
download | gitlab-ce-4bf59f87b321d59de665a0100fed9114f4b747ea.tar.gz |
Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-api-for-deleted-project
* upstream/master: (333 commits)
Fix typo
Always use `fixture_file_upload` helper to upload files in tests.
Add CHANGELOG
Move admin application spinach test to rspec
Move admin deploy keys spinach test to rspec
Fix rubocop failures
Store mattermost_url in settings
Improve Mattermost Session specs
Ensure the session is destroyed
Improve session tests
Setup mattermost session
Fix query in Projects::ProjectMembersController to fetch members
Improve test for sort dropdown on members page
Fix sort dropdown alignment
Undo changes on members search button stylesheet
Use factories to create project/group membership on specs
Remove unused id from shared members sort dropdown
Fix sort functionality on project/group members to return invited users
Refactor MembersHelper#filter_group_project_member_path
Remove unnecessary curly braces from sort dropdown partial
...
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r-- | lib/api/users.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index c7db2d71017..0842c3874c5 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -2,7 +2,10 @@ module API class Users < Grape::API include PaginationParams - before { authenticate! } + before do + allow_access_with_scope :read_user if request.get? + authenticate! + end resource :users, requirements: { uid: /[0-9]*/, id: /[0-9]*/ } do helpers do |