diff options
| author | Bryce <bryce@gitlab.com> | 2016-08-31 18:08:52 +0200 |
|---|---|---|
| committer | Bryce <bryce@gitlab.com> | 2016-08-31 18:08:52 +0200 |
| commit | ddc5b9f7236f8932c32ec9ec1d91338aab22a9e0 (patch) | |
| tree | 57b1ae2d5640a7e8f1b60c074f57e9a0bd586fef | |
| parent | a4d3c4880106535bd3a028b5c1a5786c5d6885e0 (diff) | |
| download | gitlab-ce-ddc5b9f7236f8932c32ec9ec1d91338aab22a9e0.tar.gz | |
Revert "Add last commit time to repo view"
This reverts commit 8581e152ef8fa27b6670760d39b7f06dab5f796b.
This creates really difficult conflicts with another MR that was
worked on simulataneously. That MR mostly encompassed the aims of
this commit.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5308/commits
| -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, 5 insertions, 16 deletions
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 538f211c65b..9da40fe2b09 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -11,16 +11,6 @@ } } - .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 ca5d2d7722a..558e6146ae9 100644 --- a/app/views/projects/tree/_tree_content.html.haml +++ b/app/views/projects/tree/_tree_content.html.haml @@ -5,17 +5,16 @@ %tr %th Name %th Last Update - %th.hidden-xs.last-commit - Last Commit - .last-commit-content.hidden-sm + %th.hidden-xs + .pull-left Last Commit + .last-commit.hidden-sm.pull-left + %i.fa.fa-angle-right %small.light = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" – - = time_ago_with_tooltip(@commit.committed_date) - – - = @commit.full_title + = truncate(@commit.title, length: 50) = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'pull-right' - if @path.present? |