Commit 2a5c963b authored by Robert Speicher's avatar Robert Speicher

Render Group and Project descriptions with our Markdown pipeline

parent d85a7437
...@@ -48,14 +48,16 @@ ...@@ -48,14 +48,16 @@
} }
.project-home-desc { .project-home-desc {
color: $gray;
float: left;
font-size: 16px; font-size: 16px;
line-height: 1.3; line-height: 1.3;
margin-right: 250px; margin-right: 250px;
}
.project-home-desc { // Render Markdown-generated HTML inline for this block
float: left; p {
color: $gray; display: inline;
}
} }
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@#{@group.path} @#{@group.path}
- if @group.description.present? - if @group.description.present?
.description .description
= escaped_autolink(@group.description) = markdown(@group.description)
%hr %hr
= render 'shared/show_aside' = render 'shared/show_aside'
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.project-home-row.project-home-row-top .project-home-row.project-home-row-top
.project-home-desc .project-home-desc
- if @project.description.present? - if @project.description.present?
= escaped_autolink(@project.description) = markdown(@project.description)
- if can?(current_user, :admin_project, @project) - if can?(current_user, :admin_project, @project)
– –
= link_to 'Edit', edit_namespace_project_path = link_to 'Edit', edit_namespace_project_path
......
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