diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-12-14 13:32:55 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-12-19 15:45:08 -0600 |
| commit | 3e4b45fc216875ff25647675d92448a53a740d9b (patch) | |
| tree | 836b9459d674c2aa0c34e63ed3f4c55999729d1f /lib/api | |
| parent | 8d0ad36bcfc0ef95ee9a116604ba1516367dbb27 (diff) | |
| download | gitlab-ce-3e4b45fc216875ff25647675d92448a53a740d9b.tar.gz | |
Only include the user's ID in the time_spent command's update hash
Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.
Now we only include the user ID, and perform the lookup on-demand.
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/time_tracking_endpoints.rb | 4 | ||||
| -rw-r--r-- | lib/api/v3/time_tracking_endpoints.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/time_tracking_endpoints.rb b/lib/api/time_tracking_endpoints.rb index df4632346dd..2bb451dea89 100644 --- a/lib/api/time_tracking_endpoints.rb +++ b/lib/api/time_tracking_endpoints.rb @@ -85,7 +85,7 @@ module API update_issuable(spend_time: { duration: Gitlab::TimeTrackingFormatter.parse(params.delete(:duration)), - user: current_user + user_id: current_user.id }) end @@ -97,7 +97,7 @@ module API authorize! update_issuable_key, load_issuable status :ok - update_issuable(spend_time: { duration: :reset, user: current_user }) + update_issuable(spend_time: { duration: :reset, user_id: current_user.id }) end desc "Show time stats for a project #{issuable_name}" diff --git a/lib/api/v3/time_tracking_endpoints.rb b/lib/api/v3/time_tracking_endpoints.rb index d5b90e435ba..1aad39815f9 100644 --- a/lib/api/v3/time_tracking_endpoints.rb +++ b/lib/api/v3/time_tracking_endpoints.rb @@ -86,7 +86,7 @@ module API update_issuable(spend_time: { duration: Gitlab::TimeTrackingFormatter.parse(params.delete(:duration)), - user: current_user + user_id: current_user.id }) end @@ -98,7 +98,7 @@ module API authorize! update_issuable_key, load_issuable status :ok - update_issuable(spend_time: { duration: :reset, user: current_user }) + update_issuable(spend_time: { duration: :reset, user_id: current_user.id }) end desc "Show time stats for a project #{issuable_name}" |