summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-14 14:47:19 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-14 14:47:19 +0000
commite72b9ffe98996e8fb7a104ab4b1ce8671b1186c8 (patch)
treebe5ee757df7b61a5d4bb076373334a760338b76a
parentd3f5df2bbabf8e79377aa06193d4de2608ea8748 (diff)
parent539f30ddcfd0cdbe54525e80ee4a7ac46df2bcf0 (diff)
downloadgitlab-ce-e72b9ffe98996e8fb7a104ab4b1ce8671b1186c8.tar.gz
Merge branch 'fix_tooltips' into 'master'
Fix tooltip display in list views After the recent UI changes the tooltips in a list view rendered behind the next object. This resets the tooltip's container to the body, rather than the individual `issue-info` div. In particular, this change will be applied to *all* tooltips in GitLab. This should take care of any other unidentified issues like this and should not have any negative effects that I can think of. This fixes the bug I noted in !1255. **Current:** ![Screen_Shot_2015-09-14_at_8.45.34_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/5fc6343f2e440dd10d01dfa595835e6a/Screen_Shot_2015-09-14_at_8.45.34_AM.png) **As proposed:** ![Screen_Shot_2015-09-14_at_8.44.35_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/7ffce7ce7523514bf7bb43d6380eb1d1/Screen_Shot_2015-09-14_at_8.44.35_AM.png) See merge request !1288
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a803b66c502..c3da54fd554 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -201,7 +201,7 @@ module ApplicationHelper
class: "#{html_class} js-timeago",
datetime: time.getutc.iso8601,
title: time.in_time_zone.stamp('Aug 21, 2011 9:23pm'),
- data: { toggle: 'tooltip', placement: placement }
+ data: { toggle: 'tooltip', placement: placement, container: 'body' }
element += javascript_tag "$('.js-timeago').timeago()" unless skip_js