diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 12:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 12:07:48 +0300 |
| commit | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (patch) | |
| tree | 3721386728719a7779d1cd627281e9a28cc40c4a /app/assets/javascripts/mr_popover | |
| parent | 8e22ef10e4f9c6d1ef2411aa26ddd0658e2f1461 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/mr_popover')
| -rw-r--r-- | app/assets/javascripts/mr_popover/components/mr_popover.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/mr_popover/components/mr_popover.vue b/app/assets/javascripts/mr_popover/components/mr_popover.vue index b81600660f6..ce08b0964a1 100644 --- a/app/assets/javascripts/mr_popover/components/mr_popover.vue +++ b/app/assets/javascripts/mr_popover/components/mr_popover.vue @@ -45,7 +45,7 @@ export default { return this.mergeRequest.headPipeline && this.mergeRequest.headPipeline.detailedStatus; }, formattedTime() { - return this.timeFormated(this.mergeRequest.createdAt); + return this.timeFormatted(this.mergeRequest.createdAt); }, statusBoxClass() { switch (this.mergeRequest.state) { |