BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 31bc2b94 by Dmitriy Zaporozhets
Options

Fix tree css class conflict

parent 0a6b64e6
Showing with 3 additions and 3 deletions
app/assets/stylesheets/main.scss
...@@ -136,7 +136,7 @@ $hover: #FDF5D9; ...@@ -136,7 +136,7 @@ $hover: #FDF5D9;
/** /**
* Code (files list) styles. Browsing project files there * Code (files list) styles. Browsing project files there
*/ */
@import "tree.scss"; @import "sections/tree.scss";
/** /**
* This file represent notes(comments) styles * This file represent notes(comments) styles
......
app/views/refs/_tree_item.html.haml
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
- else - else
= image_tag "file_dir.png" = image_tag "file_dir.png"
= link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true
%td.cgray %td.tree_time_ago.cgray
= time_ago_in_words(content_commit.committed_date) = time_ago_in_words(content_commit.committed_date)
ago ago
%td.commit %td.tree_commit
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name) - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm - if tm
%strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm) %strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
......
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