diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
| commit | 3c80a543153f8f686ec99d2d04b181b2d2c8a665 (patch) | |
| tree | 679ca3921b00bd9e0904b4ad1be4e01d0a753ee9 /app/helpers | |
| parent | 1a942111653e9376d6275c5bd31f23cb27f58ab5 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-3c80a543153f8f686ec99d2d04b181b2d2c8a665.tar.gz | |
Merge branch 'master' into ui/miscui/misc
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3230ff1b004..21f962df206 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -209,7 +209,7 @@ module ApplicationHelper title: time.in_time_zone.stamp('Aug 21, 2011 9:23pm'), data: { toggle: 'tooltip', placement: placement, container: 'body' } - element += javascript_tag "$('.js-timeago').timeago()" unless skip_js + element += javascript_tag "$('.js-timeago').last().timeago()" unless skip_js element end |