Skip to content
This repository was archived by the owner on Jun 21, 2020. It is now read-only.

Commit 792ebc4

Browse files
committed
Update to latest code in imathis/octopress#1590
1 parent a57e2d0 commit 792ebc4

10 files changed

+316
-728
lines changed

Gemfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ gem 'jekyll-sitemap'
77
gem 'jekyll-page-hooks'
88
gem 'octopress-codefence', '~> 1.4'
99
gem 'octopress-codeblock', '~> 1.0'
10-
gem 'octopress-gist', '~> 1.2'
10+
gem 'octopress-gist', '~> 1.3'
1111
gem 'octopress-render-code', '~> 1.0'
12+
gem 'octopress-render-tag', '~> 1.0'
1213
gem 'liquid', '2.5.5'
1314
gem 'redcarpet'
14-
gem 'compass'
15-
gem 'rubypants'
16-
gem 'stringex'
15+
gem 'compass', '~> 0.12'
16+
gem 'sass-globbing', '~> 1.0'
17+
gem 'rubypants', '~> 0.2'
18+
gem 'stringex', '~> 1.4'
1719
gem 'sinatra'
1820
gem 'thin'
1921
gem 'maruku', '0.7.0'

Gemfile.lock

+18-7
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,18 @@ GEM
5858
octopress-codefence (1.4.2)
5959
jekyll-page-hooks (>= 1.0.2)
6060
octopress-code-highlighter (~> 4.0.0)
61-
octopress-gist (1.2.0)
62-
octopress-code-highlighter (~> 4.0.0)
61+
octopress-gist (1.3.3)
62+
jekyll (~> 2.0.3)
63+
octopress-code-highlighter (~> 4.0.2)
6364
octopress-render-code (1.0.0)
6465
jekyll (~> 2.0.3)
6566
octopress-code-highlighter (~> 4.0.1)
67+
octopress-render-tag (1.0.2)
68+
jekyll (~> 2.0)
69+
jekyll-page-hooks (~> 1.0)
70+
octopress-tag-helpers (~> 1.0)
71+
octopress-tag-helpers (1.0.1)
72+
jekyll (~> 2.0)
6673
parslet (1.5.0)
6774
blankslate (~> 2.0)
6875
posix-spawn (0.3.8)
@@ -81,11 +88,13 @@ GEM
8188
rubypants (0.2.0)
8289
safe_yaml (1.0.3)
8390
sass (3.2.19)
91+
sass-globbing (1.1.1)
92+
sass (>= 3.1)
8493
sinatra (1.4.5)
8594
rack (~> 1.4)
8695
rack-protection (~> 1.4)
8796
tilt (~> 1.3, >= 1.3.4)
88-
stringex (2.5.2)
97+
stringex (1.5.1)
8998
thin (1.6.2)
9099
daemons (>= 1.0.9)
91100
eventmachine (>= 1.0.0)
@@ -100,21 +109,23 @@ PLATFORMS
100109
ruby
101110

102111
DEPENDENCIES
103-
compass
112+
compass (~> 0.12)
104113
jekyll (~> 2.0)
105114
jekyll-page-hooks
106115
jekyll-sitemap
107116
liquid (= 2.5.5)
108117
maruku (= 0.7.0)
109118
octopress-codeblock (~> 1.0)
110119
octopress-codefence (~> 1.4)
111-
octopress-gist (~> 1.2)
120+
octopress-gist (~> 1.3)
112121
octopress-render-code (~> 1.0)
122+
octopress-render-tag (~> 1.0)
113123
rack
114124
rake
115125
redcarpet
116126
rouge
117-
rubypants
127+
rubypants (~> 0.2)
128+
sass-globbing (~> 1.0)
118129
sinatra
119-
stringex
130+
stringex (~> 1.4)
120131
thin

plugins/octopress_filters.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Custom filters for Octopress
2-
require 'jekyll-page-hooks'
32
require 'octopress-codefence'
43
require 'octopress-codeblock'
54
require 'octopress-gist'
65
require 'octopress-render-code'
7-
require './plugins/raw'
6+
require 'octopress-render-tag'
87

98
module OctopressLiquidFilters
109
include Octopress::Date
@@ -100,5 +99,5 @@ def titlecase(input)
10099
end
101100

102101
end
103-
Liquid::Template.register_filter OctopressLiquidFilters
104102

103+
Liquid::Template.register_filter OctopressLiquidFilters

plugins/raw.rb

-15
This file was deleted.

plugins/render_partial.rb

-77
This file was deleted.

0 commit comments

Comments
 (0)