summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-09-11 20:23:51 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-09-11 20:23:51 +0000
commit8a51771a3f5857251d4a255dfe81de7d81379160 (patch)
tree8ea9d358e30035860c8d0a4ab6133a82322aaa24
parentde14e9c20392c4edfb9ee05f8a3364d7510a4f99 (diff)
parentd912b49320417f5b3edde00a703adb8550a165da (diff)
downloadgitlab-ce-8a51771a3f5857251d4a255dfe81de7d81379160.tar.gz
Merge branch 'consistent-tooltip-direction-on-commits' into 'master'
Make all the tooltips in the same direction on the commit info box See merge request !14128
-rw-r--r--app/views/projects/commits/_commit.html.haml2
-rw-r--r--changelogs/unreleased/consistent-tooltip-direction-on-commits.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index b8655808d89..a16ffb433a5 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -32,7 +32,7 @@
.commiter
- commit_author_link = commit_author_link(commit, avatar: false, size: 24)
- - commit_timeago = time_ago_with_tooltip(commit.committed_date)
+ - commit_timeago = time_ago_with_tooltip(commit.committed_date, placement: 'bottom')
- commit_text = _('%{commit_author_link} committed %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago }
#{ commit_text.html_safe }
diff --git a/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml b/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml
new file mode 100644
index 00000000000..9e6a429f6f0
--- /dev/null
+++ b/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml
@@ -0,0 +1,5 @@
+---
+title: Tooltips in the commit info box now all face the same direction
+merge_request:
+author: Jedidiah Broadbent
+type: fixed