summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--app/views/groups/show.html.haml2
-rw-r--r--app/views/projects/_home_panel.html.haml2
3 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 34d312b4100..e8a9c2efadf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -259,4 +259,8 @@ module ApplicationHelper
super
end
+
+ def escaped_autolink(text)
+ auto_link ERB::Util.html_escape(text), link: :urls
+ end
end
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 4f4fc537d34..d876e87852c 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -24,7 +24,7 @@
= @group.name
- if @group.description.present?
%p
- = auto_link @group.description, link: :urls
+ = escaped_autolink(@group.description)
= render "projects", projects: @projects
- if current_user
.prepend-top-20
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index cdbdec698fa..672a91e0eef 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -3,7 +3,7 @@
.project-home-row
.project-home-desc
- if @project.description.present?
- = auto_link ERB::Util.html_escape(@project.description), link: :urls
+ = escaped_autolink(@project.description)
- if can?(current_user, :admin_project, @project)
–
= link_to 'Edit', edit_project_path