Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update to middleman 3.0

  • Loading branch information...
commit 9125666bb7901e536e07780f2ba974e7550c2d9c 1 parent 8249919
@durran durran authored
Showing with 42 additions and 61 deletions.
  1. +1 −2  Gemfile
  2. +41 −51 Gemfile.lock
  3. +0 −8 config.rb
View
3  Gemfile
@@ -1,5 +1,4 @@
source :rubygems
gem "haml-coderay"
-gem "heroku"
-gem "middleman", "3.0.0.beta.3"
+gem "middleman", "~> 3.0.0"
gem "middleman-smusher"
View
92 Gemfile.lock
@@ -1,33 +1,27 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.2.3)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
chunky_png (1.2.5)
- coderay (1.0.4)
+ coderay (1.0.7)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.3.3)
- compass (0.12.1)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- execjs (1.3.2)
+ execjs (1.4.0)
multi_json (~> 1.0)
ffi (1.0.11)
fssm (0.2.9)
- haml (3.1.4)
+ haml (3.1.6)
haml-coderay (0.1.2)
coderay
haml
- heroku (2.25.0)
- launchy (>= 0.3.2)
- netrc (~> 0.7.1)
- rest-client (~> 1.6.1)
- rubyzip
hike (1.2.1)
http_router (0.10.2)
rack (>= 1.0.0)
@@ -35,52 +29,52 @@ GEM
httpclient (2.2.5)
i18n (0.6.0)
json (1.7.3)
- launchy (2.1.0)
- addressable (~> 2.2.6)
- listen (0.4.2)
+ listen (0.4.7)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
maruku (0.6.0)
syntax (>= 1.0.0)
- middleman (3.0.0.beta.3)
- middleman-core (= 3.0.0.beta.3)
- middleman-more (= 3.0.0.beta.3)
- middleman-core (3.0.0.beta.3)
- activesupport (~> 3.2.0)
- bundler (~> 1.0)
- i18n (~> 0.6.0)
- listen (~> 0.4.2)
- padrino-helpers (~> 0.10.6)
- rack (~> 1.4.0)
+ middleman (3.0.0)
+ middleman-core (= 3.0.0)
+ middleman-more (= 3.0.0)
+ middleman-sprockets (= 3.0.0)
+ middleman-core (3.0.0)
+ activesupport (~> 3.2.6)
+ bundler (~> 1.1)
+ listen (~> 0.4.7)
+ rack (~> 1.4.1)
rack-test (~> 0.6.1)
- thor (~> 0.14.0)
+ thor (~> 0.15.4)
tilt (~> 1.3.1)
- middleman-more (3.0.0.beta.3)
+ middleman-more (3.0.0)
coffee-script (~> 2.2.0)
- compass (>= 0.12.1)
- execjs (~> 1.3.2)
- haml (>= 3.1.0)
+ coffee-script-source (~> 1.3.3)
+ compass (>= 0.12.2)
+ execjs (~> 1.4.0)
+ haml (>= 3.1.6)
+ i18n (~> 0.6.0)
maruku (~> 0.6.0)
- middleman-core (= 3.0.0.beta.3)
- sass (>= 3.1.7)
- sprockets (~> 2.1)
- sprockets-sass (~> 0.8.0)
- uglifier (~> 1.2.0)
+ middleman-core (= 3.0.0)
+ padrino-helpers (= 0.10.7)
+ sass (>= 3.1.20)
+ uglifier (~> 1.2.6)
middleman-smusher (0.0.1)
smusher (~> 0.4.6)
- mime-types (1.18)
- multi_json (1.3.5)
- netrc (0.7.1)
- padrino-core (0.10.6)
+ middleman-sprockets (3.0.0)
+ middleman-more (= 3.0.0)
+ sprockets (~> 2.1)
+ sprockets-sass (~> 0.8.0)
+ multi_json (1.3.6)
+ padrino-core (0.10.7)
activesupport (~> 3.2.0)
http_router (~> 0.10.2)
sinatra (~> 1.3.1)
- thor (~> 0.14.3)
+ thor (~> 0.15.2)
tilt (~> 1.3.0)
- padrino-helpers (0.10.6)
+ padrino-helpers (0.10.7)
i18n (~> 0.6)
- padrino-core (= 0.10.6)
+ padrino-core (= 0.10.7)
rack (1.4.1)
rack-protection (1.2.0)
rack
@@ -92,10 +86,7 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
- rest-client (1.6.7)
- mime-types (>= 1.16)
- rubyzip (0.9.8)
- sass (3.1.19)
+ sass (3.1.20)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
@@ -104,7 +95,7 @@ GEM
httpclient (>= 2.2)
json
rake
- sprockets (2.4.3)
+ sprockets (2.4.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -113,11 +104,11 @@ GEM
sprockets (~> 2.0)
tilt (~> 1.1)
syntax (1.0.0)
- thor (0.14.6)
+ thor (0.15.4)
tilt (1.3.3)
- uglifier (1.2.4)
+ uglifier (1.2.6)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.3)
url_mount (0.2.1)
rack
@@ -126,6 +117,5 @@ PLATFORMS
DEPENDENCIES
haml-coderay
- heroku
- middleman (= 3.0.0.beta.3)
+ middleman (~> 3.0.0)
middleman-smusher
View
8 config.rb
@@ -2,7 +2,6 @@
Encoding.default_external = "utf-8"
Haml::Filters::CodeRay.encoder_options = { :css => :class }
-Haml::Template.options[:encoding] = "utf-8"
page "/en/mongoid/*", layout: "en/layouts/mongoid"
page "/en/origin/*", layout: "en/layouts/origin"
@@ -18,10 +17,3 @@
ignore "/zh-cn/layouts/mongoid.haml"
ignore "/zh-cn/layouts/moped.haml"
ignore "/zh-cn/layouts/origin.haml"
-
-helpers do
-
- def header_class(section)
- request.path =~ /(docs|links)/i ? "basic" : section
- end
-end
Please sign in to comment.
Something went wrong with that request. Please try again.