diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 14:34:17 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 14:34:17 +0000 |
commit | a207c3d12f75644d72c7ea720949b8c58c89faa9 (patch) | |
tree | c197a4c40c610cd18eb7a4dcb9bdfd7012c4c4d9 /app | |
parent | e33a9bee68011b7cfc604acd8d87bf4242c45451 (diff) | |
parent | c5205046105cb908df1fb753ca31d8e4fa4f60a2 (diff) | |
download | gitlab-ce-a207c3d12f75644d72c7ea720949b8c58c89faa9.tar.gz |
Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widget' into 'master'
Fix timeago rendering for environment timeago
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24552
See merge request !7539
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 += '.'; |