Commit afe47e26 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add autolink to project/group description render

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 92ccc687
...@@ -13,6 +13,9 @@ gem "rails", "~> 4.1.0" ...@@ -13,6 +13,9 @@ gem "rails", "~> 4.1.0"
gem "protected_attributes" gem "protected_attributes"
gem 'rails-observers' gem 'rails-observers'
# Make links from text
gem 'rails_autolink', '~> 1.1'
# Default values for AR models # Default values for AR models
gem "default_value_for", "~> 3.0.0" gem "default_value_for", "~> 3.0.0"
......
...@@ -367,6 +367,8 @@ GEM ...@@ -367,6 +367,8 @@ GEM
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-observers (0.1.2) rails-observers (0.1.2)
activemodel (~> 4.0) activemodel (~> 4.0)
rails_autolink (1.1.6)
rails (> 3.1)
rails_best_practices (1.14.4) rails_best_practices (1.14.4)
activesupport activesupport
awesome_print awesome_print
...@@ -641,6 +643,7 @@ DEPENDENCIES ...@@ -641,6 +643,7 @@ DEPENDENCIES
rack-mini-profiler rack-mini-profiler
rails (~> 4.1.0) rails (~> 4.1.0)
rails-observers rails-observers
rails_autolink (~> 1.1)
rails_best_practices rails_best_practices
raphael-rails (~> 2.1.2) raphael-rails (~> 2.1.2)
rb-fsevent rb-fsevent
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
%h3.page-title %h3.page-title
= @group.name = @group.name
- if @group.description.present? - if @group.description.present?
%p= @group.description %p
= auto_link @group.description, link: :urls
= render "projects", projects: @projects = render "projects", projects: @projects
- if current_user - if current_user
.prepend-top-20 .prepend-top-20
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.col-md-8 .col-md-8
.project-home-desc .project-home-desc
- if @project.description.present? - if @project.description.present?
= @project.description = auto_link @project.description, link: :urls
- if can?(current_user, :admin_project, @project) - if can?(current_user, :admin_project, @project)
&ndash; &ndash;
%strong= link_to 'Edit', edit_project_path %strong= link_to 'Edit', edit_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