diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-28 17:56:52 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-02 13:04:10 -0400 |
| commit | 2a5c963b7cd2dc1cf1e6b4d1a291c37d313b5813 (patch) | |
| tree | 3ce3ab9bde9482e57abe7497c391adcd6330eef5 | |
| parent | d85a7437a5651a93fc20d9bf7f183293151adb77 (diff) | |
| download | gitlab-ce-2a5c963b7cd2dc1cf1e6b4d1a291c37d313b5813.tar.gz | |
Render Group and Project descriptions with our Markdown pipeline
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 10 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 12489ccc2d7..b93ea0f020e 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -48,14 +48,16 @@ } .project-home-desc { + color: $gray; + float: left; font-size: 16px; line-height: 1.3; margin-right: 250px; - } - .project-home-desc { - float: left; - color: $gray; + // Render Markdown-generated HTML inline for this block + p { + display: inline; + } } } diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 1678311141e..f42007da073 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -11,7 +11,7 @@ @#{@group.path} - if @group.description.present? .description - = escaped_autolink(@group.description) + = markdown(@group.description) %hr = render 'shared/show_aside' diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index f9cdda4a3ba..05f44acd3cb 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -5,7 +5,7 @@ .project-home-row.project-home-row-top .project-home-desc - if @project.description.present? - = escaped_autolink(@project.description) + = markdown(@project.description) - if can?(current_user, :admin_project, @project) – = link_to 'Edit', edit_namespace_project_path |