diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-07 07:56:13 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-07 07:56:13 +0000 |
commit | a2d6af9772af20ff122d6bc3bfc7059b309d0d1d (patch) | |
tree | 0f61951d20419f1d7c40eec2160f65e388a131d0 | |
parent | a1e6fc157f70f1fe5e8d7b8cc9a34d1ff108b7d8 (diff) | |
parent | 5d4eec08a19cb0f33eaa4d37490e30a00c496ba0 (diff) | |
download | gitlab-ce-a2d6af9772af20ff122d6bc3bfc7059b309d0d1d.tar.gz |
Merge branch 'explore-markdown' into 'master'
Apply markdown filter for project descriptions on explore view
When you open the explore page, then the project descriptions are not rendered correctly (e.g., https://gitlab.com/search?search=tortoisegit).
See merge request !1098
-rw-r--r-- | app/views/explore/projects/_project.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml index d769c91545d..1e8a89e3661 100644 --- a/app/views/explore/projects/_project.html.haml +++ b/app/views/explore/projects/_project.html.haml @@ -9,8 +9,8 @@ .project-info - if project.description.present? - %p.project-description.str-truncated - = project.description + .project-description.str-truncated + = markdown(project.description, pipeline: :description) .repo-info - unless project.empty_repo? |