summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-28 17:57:23 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-02 13:04:10 -0400
commit1a52f19c456dfa307dd7fa0e5adbaa2ed1a68889 (patch)
tree6961146538616aacf64bf8f3cfbc9ba12c4346ec
parent2a5c963b7cd2dc1cf1e6b4d1a291c37d313b5813 (diff)
downloadgitlab-ce-1a52f19c456dfa307dd7fa0e5adbaa2ed1a68889.tar.gz
Remove now-unused `escaped_autolink` helper and rails_autolink gem
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock3
-rw-r--r--app/helpers/application_helper.rb4
3 files changed, 0 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index 78af7f5db69..94e2129f3c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,6 @@ end
gem "rails", "~> 4.1.0"
-# Make links from text
-gem 'rails_autolink', '~> 1.1'
-
# Default values for AR models
gem "default_value_for", "~> 3.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index bbc5639c84f..80ae41dc8fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -448,8 +448,6 @@ GEM
sprockets-rails (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
- rails_autolink (1.1.6)
- rails (> 3.1)
railties (4.1.9)
actionpack (= 4.1.9)
activesupport (= 4.1.9)
@@ -779,7 +777,6 @@ DEPENDENCIES
rack-mini-profiler
rack-oauth2 (~> 1.0.5)
rails (~> 4.1.0)
- rails_autolink (~> 1.1)
raphael-rails (~> 2.1.2)
rb-fsevent
rb-inotify
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 89dcdf57798..a539ec49f7a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -279,10 +279,6 @@ module ApplicationHelper
html_options
end
- def escaped_autolink(text)
- auto_link ERB::Util.html_escape(text), link: :urls
- end
-
def promo_host
'about.gitlab.com'
end