diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-30 21:52:59 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-30 21:52:59 +0300 |
commit | dcea06c61ab388935f5086b61b399c36a74c42c4 (patch) | |
tree | fb8169aef61e957eca7e978096b66940939a5a78 /app | |
parent | b3b3bc2565cdf133ae38844d8df9ccf453bf0e5c (diff) | |
parent | 8581e152ef8fa27b6670760d39b7f06dab5f796b (diff) |
Merge branch 'add-time-repo-view' into 'master'
Add last commit time to repo view
## What does this MR do?
Adds the last commit time to the repository file view
## Are there points in the code the reviewer needs to double check?
Just need to make sure it works well in responsive (It is working well to my knowledge :smiley: )
## Why was this MR needed?
Allow users to see more information related to the last commit
## What are the relevant issue numbers?
Closes #20224
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-07-27_at_1.54.03_PM](/uploads/2b3da5c6b82965fd302abe590d2b0e46/Screen_Shot_2016-07-27_at_1.54.03_PM.png)
After:
![Screen_Shot_2016-07-27_at_1.54.09_PM](/uploads/1f5f5fe1bd6f193090067a41ac4e3c66/Screen_Shot_2016-07-27_at_1.54.09_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5530
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 10 | ||||
-rw-r--r-- | app/views/projects/tree/_tree_content.html.haml | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 9da40fe2b09..538f211c65b 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -11,6 +11,16 @@ } } + .last-commit { + max-width: 506px; + + .last-commit-content { + @include str-truncated; + width: calc(100% - 140px); + margin-left: 3px; + } + } + .tree-table { margin-bottom: 0; diff --git a/app/views/projects/tree/_tree_content.html.haml b/app/views/projects/tree/_tree_content.html.haml index 558e6146ae9..ca5d2d7722a 100644 --- a/app/views/projects/tree/_tree_content.html.haml +++ b/app/views/projects/tree/_tree_content.html.haml @@ -5,16 +5,17 @@ %tr %th Name %th Last Update - %th.hidden-xs - .pull-left Last Commit - .last-commit.hidden-sm.pull-left - + %th.hidden-xs.last-commit + Last Commit + .last-commit-content.hidden-sm %i.fa.fa-angle-right %small.light = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" – - = truncate(@commit.title, length: 50) + = time_ago_with_tooltip(@commit.committed_date) + – + = @commit.full_title = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'pull-right' - if @path.present? |