Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-12 23:58:59 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-12 23:58:59 +0400
commitafe47e26f5961c5578ef28a79c7dc0ca43db76dd (patch)
treedcc1e5b3cad8c3ab099eff2567d78bbb660104df /app
parent92ccc687b0154a129cad0b899e639e60c886ddff (diff)
Add autolink to project/group description render
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/views/groups/show.html.haml5
-rw-r--r--app/views/projects/_home_panel.html.haml2
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 17475288a87..06183dd74a9 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,7 +5,7 @@
= link_to dashboard_path, class: 'btn btn-tiny' do
&larr; To dashboard
&nbsp;
- %span.cgray
+ %span.cgray
Currently you are only seeing events from the
= @group.name
group
@@ -23,7 +23,8 @@
%h3.page-title
= @group.name
- if @group.description.present?
- %p= @group.description
+ %p
+ = auto_link @group.description, link: :urls
= 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 b24fd5a8514..3851fd6c15b 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -17,7 +17,7 @@
.col-md-8
.project-home-desc
- if @project.description.present?
- = @project.description
+ = auto_link @project.description, link: :urls
- if can?(current_user, :admin_project, @project)
&ndash;
%strong= link_to 'Edit', edit_project_path