diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-11-17 14:41:35 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-11-19 12:17:58 -0600 |
| commit | c5205046105cb908df1fb753ca31d8e4fa4f60a2 (patch) | |
| tree | f8609662f892203ebac3dc9c4c7dabc676bb044c /app | |
| parent | 18a646c38808c645773a4ea3eb2ddebb273cf6bc (diff) | |
| download | gitlab-ce-c5205046105cb908df1fb753ca31d8e4fa4f60a2.tar.gz | |
Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widget
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 56c87af3226..54929cd8f24 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -218,7 +218,7 @@ } if (environment.deployed_at && environment.deployed_at_formatted) { - environment.deployed_at = gl.utils.getTimeago(environment.deployed_at) + '.'; + environment.deployed_at = gl.utils.getTimeago().format(environment.deployed_at, 'gl_en') + '.'; } else { $('.js-environment-timeago', $template).remove(); environment.name += '.'; |