Commit dcea06c6 authored by Fatih Acet's avatar Fatih Acet

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 😃 )

## 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
parents b3b3bc25 8581e152
...@@ -24,6 +24,7 @@ v 8.12.0 (unreleased) ...@@ -24,6 +24,7 @@ v 8.12.0 (unreleased)
- Fix groups sort dropdown alignment (ClemMakesApps) - Fix groups sort dropdown alignment (ClemMakesApps)
- Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps) - Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps)
- Fix markdown help references (ClemMakesApps) - Fix markdown help references (ClemMakesApps)
- Add last commit time to repo view (ClemMakesApps)
- Added tests for diff notes - Added tests for diff notes
- Add a button to download latest successful artifacts for branches and tags !5142 - Add a button to download latest successful artifacts for branches and tags !5142
- Add delimiter to project stars and forks count (ClemMakesApps) - Add delimiter to project stars and forks count (ClemMakesApps)
......
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
} }
} }
.last-commit {
max-width: 506px;
.last-commit-content {
@include str-truncated;
width: calc(100% - 140px);
margin-left: 3px;
}
}
.tree-table { .tree-table {
margin-bottom: 0; margin-bottom: 0;
......
...@@ -5,16 +5,17 @@ ...@@ -5,16 +5,17 @@
%tr %tr
%th Name %th Name
%th Last Update %th Last Update
%th.hidden-xs %th.hidden-xs.last-commit
.pull-left Last Commit Last Commit
.last-commit.hidden-sm.pull-left .last-commit-content.hidden-sm
 
%i.fa.fa-angle-right %i.fa.fa-angle-right
   
%small.light %small.light
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" = 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' = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'pull-right'
- if @path.present? - if @path.present?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment