diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-12-21 17:20:43 -0600 |
| commit | aa1874fbf8795677e53797205cb65b6f4fb83d4c (patch) | |
| tree | 85a5cfb6bdac803258df8e2df09a50169468996a /lib/api/time_tracking_endpoints.rb | |
| parent | 3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff) | |
| parent | 82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff) | |
| download | gitlab-ce-move-gl-dropdown.tar.gz | |
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
Diffstat (limited to 'lib/api/time_tracking_endpoints.rb')
| -rw-r--r-- | lib/api/time_tracking_endpoints.rb | 4 |
1 files changed, 2 insertions, 2 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}" |