diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
commit | 926c3bef9fbda49d5cab268bcd83355142e945c1 (patch) | |
tree | 1dc2b7eb13485f0fc656cc913ca56e57b672b62a /app/helpers/application_helper.rb | |
parent | 1a10945066d0da1801bb4cf89ce5f54996f1756f (diff) | |
parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
download | gitlab-ce-reference-pipeline-and-caching.tar.gz |
Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching
Diffstat (limited to 'app/helpers/application_helper.rb')
-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 |