diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
| commit | 88f33a1266ca51d48272e858c399daedd837575f (patch) | |
| tree | 9c0da433d01a0cf01cdc0ded774c8b85a949403f /lib/api/v3/users.rb | |
| parent | b3ea598b1aeaf7f3eb0071b60f97247ad67e69f4 (diff) | |
| parent | 8199ff7bd71ce91fbc945b2c31010fcf654bda67 (diff) | |
| download | gitlab-ce-update-trace-handling-code.tar.gz | |
Merge branch 'master' into 'update-trace-handling-code'update-trace-handling-code
# Conflicts:
# app/assets/javascripts/build.js
Diffstat (limited to 'lib/api/v3/users.rb')
| -rw-r--r-- | lib/api/v3/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/v3/users.rb b/lib/api/v3/users.rb index 5e18cecc431..f4cda3b2eba 100644 --- a/lib/api/v3/users.rb +++ b/lib/api/v3/users.rb @@ -138,7 +138,7 @@ module API not_found!('User') unless user events = user.events. - merge(ProjectsFinder.new.execute(current_user)). + merge(ProjectsFinder.new(current_user: current_user).execute). references(:project). with_associations. recent |