add autolink to bohconf session abstract

austinonrails · Apr 21, 2012 · 2ad18ae · 2ad18ae
1 parent 06dd981
commit 2ad18ae
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 44 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,9 +5,8 @@ gem 'rails', '3.2.1'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'pg'
 gem 'newrelic_rpm'
-
+gem 'rails_autolink'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -22,7 +21,6 @@ group :assets do
 end
 
 gem 'jquery-rails'
-gem 'pgbackup-tasks'
 
 gem 'oauth', '~> 0.4.5'
 gem 'twitter', '~> 2.0.0'
@@ -41,3 +39,8 @@ gem 'twitter', '~> 2.0.0'
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
+
+# group :production do
+#   gem 'pg'
+#   gem 'pgbackup-tasks'
+# end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,44 +37,33 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
+    coffee-script-source (1.3.1)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
-    heroku (2.23.0)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.1)
-      rest-client (~> 1.6.1)
-      rubyzip
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    mail (2.4.1)
+    json (1.6.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
-    multipart-post (1.1.4)
-    netrc (0.7.1)
-    newrelic_rpm (3.3.2)
-    oauth (0.4.5)
-    pg (0.13.2)
-    pgbackup-tasks (0.2.3)
-      heroku (>= 2.17.0)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    multipart-post (1.1.5)
+    newrelic_rpm (3.3.4)
+    oauth (0.4.6)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
@@ -88,6 +77,8 @@ GEM
       activesupport (= 3.2.1)
       bundler (~> 1.0)
       railties (= 3.2.1)
+    rails_autolink (1.0.6)
+      rails (~> 3.1)
     railties (3.2.1)
       actionpack (= 3.2.1)
       activesupport (= 3.2.1)
@@ -98,11 +89,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rubyzip (0.9.6.1)
-    sass (3.1.15)
-    sass-rails (3.2.4)
+    sass (3.1.16)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -116,16 +104,13 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (2.0.0)
-      activesupport (~> 3.0)
+    twitter (2.0.2)
+      activesupport (>= 2.3.9, < 4)
       faraday (~> 0.7)
       multi_json (~> 1.0)
       simple_oauth (~> 0.1)
-      twitter-text (~> 1.4)
-    twitter-text (1.4.13)
-      activesupport
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
 
@@ -137,9 +122,8 @@ DEPENDENCIES
   jquery-rails
   newrelic_rpm
   oauth (~> 0.4.5)
-  pg
-  pgbackup-tasks
   rails (= 3.2.1)
+  rails_autolink
   sass-rails (~> 3.2.3)
   twitter (~> 2.0.0)
   uglifier (>= 1.0.3)
diff --git a/app/views/pages/bohconf.html.erb b/app/views/pages/bohconf.html.erb
@@ -34,7 +34,7 @@
 					<h2><%= link_to_if session.host_twitter.present?, session.host_name, "http://twitter.com/#{session.host_twitter}" %></h2>
 					<h2><%= session.title %></h2>
 					<p class="session-description">
-						<%= session.abstract %>
+						<%= auto_link session.abstract %>
 					</p>
 				</li>
 			<% end %>