diff options
| author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
| commit | fb80347dc00657ba36576f1f23bd42fdbcf9520a (patch) | |
| tree | 2642ac39cda31e29ea80defdc71e00c89ac8979e /lib/api/time_tracking_endpoints.rb | |
| parent | 73924cc51495f5f497114ed9f9de02f8b9c4205b (diff) | |
| parent | 6eb96b2019d392d906a64108dbe83b3ce7cce758 (diff) | |
| download | gitlab-ce-additional-metrics-dashboard.tar.gz | |
Merge branch '28717-additional-metrics-review-branch' into 'additional-metrics-dashboard'additional-metrics-dashboard
# Conflicts:
# app/assets/stylesheets/pages/environments.scss
Diffstat (limited to 'lib/api/time_tracking_endpoints.rb')
| -rw-r--r-- | lib/api/time_tracking_endpoints.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/time_tracking_endpoints.rb b/lib/api/time_tracking_endpoints.rb index 05b4b490e27..df4632346dd 100644 --- a/lib/api/time_tracking_endpoints.rb +++ b/lib/api/time_tracking_endpoints.rb @@ -5,7 +5,7 @@ module API included do helpers do def issuable_name - declared_params.has_key?(:issue_iid) ? 'issue' : 'merge_request' + declared_params.key?(:issue_iid) ? 'issue' : 'merge_request' end def issuable_key |