diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 20:39:29 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 20:39:29 +0000 |
| commit | 2cb4cb2ee3bc2d34eb1c24f7643e7cfae84e4d17 (patch) | |
| tree | e60bd4c5800d48d22efaf97f03c3ea6b8d62143c /app/views | |
| parent | c05604a6c26651fde909a3e3d9ab59cbf4191056 (diff) | |
| parent | 541e663c125f322cdbb680a9081f2e8470d9ef4e (diff) | |
| download | gitlab-ce-2cb4cb2ee3bc2d34eb1c24f7643e7cfae84e4d17.tar.gz | |
Merge branch 'issue_17607' into 'master'
Fix local timeago on user dashboard
## What does this MR do?
Fixes incorrect date times on tooltips on the dashboard page
## Are there points in the code the reviewer needs to double check?
Yes, The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.
## Why was this MR needed?
Because the datetimes were incorrect we have to have the same format for .timeago() instances.
## What are the relevant issue numbers?
#17607
## Screenshots (if relevant)
**Before**
<img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">
**After**
<img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">
See merge request !4285
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/users/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 8268380dafc..92305594a81 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -79,10 +79,10 @@ %li.js-contributed-tab = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do Contributed projects - %li.projects-tab + %li.js-projects-tab = link_to user_projects_path, data: {target: 'div#projects', action: 'projects', toggle: 'tab'} do Personal projects - %li.snippets-tab + %li.js-snippets-tab = link_to user_snippets_path, data: {target: 'div#snippets', action: 'snippets', toggle: 'tab'} do Snippets |