diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-07-10 13:42:16 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-07-10 13:42:16 -0500 |
| commit | a0e468b551537d876c2d8cdc1b98b60a1ecd351e (patch) | |
| tree | 845a387bf21ed9e7df48ec5a6e3fb0bb81d3d830 | |
| parent | fc2766106368b05aa1694d093c430a58a5687810 (diff) | |
| download | gitlab-ce-a0e468b551537d876c2d8cdc1b98b60a1ecd351e.tar.gz | |
Fix conflict
| -rw-r--r-- | lib/api/users.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 9307f5f46f7..db1f0ff392b 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -3,14 +3,11 @@ module API include PaginationParams include APIGuard -<<<<<<< HEAD + allow_access_with_scope :read_user, if: -> (request) { request.get? } + before do - allow_access_with_scope :read_user if request.get? authenticate! end -======= - allow_access_with_scope :read_user, if: -> (request) { request.get? } ->>>>>>> 9876895... Merge branch '33580-fix-api-scoping' into 'master' resource :users, requirements: { uid: /[0-9]*/, id: /[0-9]*/ } do helpers do |