Permalink
Browse files

Fix issues from previous merge

  • Loading branch information...
1 parent 6624679 commit f5ce330e1a66e67e2fe5a845136e32f084f7e0f1 @natew committed Apr 26, 2012
Showing with 3 additions and 11 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +0 −2 app/controllers/posts_controller.rb
  4. +0 −6 app/helpers/application_helper.rb
View
@@ -7,7 +7,7 @@ gem 'thin', '~> 1'
# Rendering engines and vendor libraries
gem 'jquery-rails', '~> 2'
-gem 'rdiscount'
+gem 'redcarpet'
# Misc libraries
# gem 'bcrypt-ruby', '~> 3', require: 'bcrypt'
View
@@ -125,9 +125,9 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rdiscount (1.6.8)
rdoc (3.12)
json (~> 1.4)
+ redcarpet (2.1.1)
rubyzip (0.9.6.1)
sass (3.1.15)
sass-rails (3.2.5)
@@ -190,7 +190,7 @@ DEPENDENCIES
pg (~> 0.13)
rails (~> 3)
rails_best_practices (~> 1)
- rdiscount
+ redcarpet
sass-rails (~> 3)
spork (~> 0.9)
sqlite3 (~> 1)
@@ -1,5 +1,3 @@
-require 'rdiscount'
-
class PostsController < ApplicationController
before_filter :authenticate, :except => [:index, :show]
layout :choose_layout
@@ -5,11 +5,6 @@ def is_admin?
def markdown(text)
text = youtube_embed(text)
-<<<<<<< HEAD
- r = RDiscount.new(text)
- r.smart = true
- r
-=======
text = gist_embed(text)
RedcarpetCompat.new(text, :fenced_code, :gh_blockcode)
end
@@ -22,7 +17,6 @@ def gist_embed(str)
match ? "<div id=\"#{match[1]}\" class=\"gist\">Loading gist...</div>" : line
end
output.join
->>>>>>> c647a5a... removed dependency on js library to embed gists, now using simple ajax call and css to get and style gists
end
def youtube_embed(str)

0 comments on commit f5ce330

Please sign in to comment.