Permalink
Browse files

change config & gemfile

  • Loading branch information...
1 parent 4aa69f2 commit aedbb0d1df0e27893e89fef9b4be72d8036dde18 @evenwu committed Nov 20, 2011
Showing with 33 additions and 31 deletions.
  1. +32 −30 Gemfile.lock
  2. +1 −1 config.rb
View
@@ -1,24 +1,24 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.1.0)
+ activesupport (3.1.1)
multi_json (~> 1.0)
addressable (2.2.6)
- chunky_png (1.2.1)
+ chunky_png (1.2.5)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
+ coffee-script-source (1.1.3)
compass (0.11.5)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
daemons (1.1.4)
- em-websocket (0.3.1)
+ em-websocket (0.3.5)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
eventmachine (0.12.10)
- execjs (1.2.4)
+ execjs (1.2.9)
multi_json (~> 1.0)
fssm (0.2.7)
guard (0.6.3)
@@ -35,50 +35,52 @@ GEM
i18n (0.6.0)
maruku (0.6.0)
syntax (>= 1.0.0)
- middleman (2.0.8)
+ middleman (2.0.14)
coffee-script (~> 2.2.0)
compass (~> 0.11.3)
+ execjs (~> 1.2.7)
guard (~> 0.6.2)
haml (~> 3.1.0)
maruku (~> 0.6.0)
middleman-livereload (~> 0.2.0)
- padrino-core (~> 0.10.2)
- padrino-helpers (~> 0.10.2)
- rack (~> 1.3.0)
+ padrino-core (~> 0.10.5)
+ padrino-helpers (~> 0.10.5)
+ rack (~> 1.3.5)
rack-test (~> 0.6.1)
- rb-fsevent (~> 0.4.2)
sass (~> 3.1.7)
- sinatra (~> 1.2.6)
- slim (~> 1.0.1)
- sprockets (~> 2.0.0)
+ sinatra (~> 1.3.1)
+ slim (~> 1.0.2)
+ sprockets (~> 2.0.3)
thin (~> 1.2.11)
thor (~> 0.14.0)
tilt (~> 1.3.1)
uglifier (~> 1.0.0)
- middleman-livereload (0.2.0)
- guard-livereload (~> 0.3.0)
+ middleman-livereload (0.2.1)
+ guard-livereload (~> 0.3.1)
multi_json (1.0.3)
- padrino-core (0.10.2)
+ padrino-core (0.10.5)
activesupport (~> 3.1.0)
http_router (~> 0.10.2)
- sinatra (~> 1.2.6)
+ sinatra (~> 1.3.1)
thor (~> 0.14.3)
tilt (~> 1.3.0)
- padrino-helpers (0.10.2)
+ padrino-helpers (0.10.5)
i18n (~> 0.6)
- padrino-core (= 0.10.2)
- rack (1.3.2)
+ padrino-core (= 0.10.5)
+ rack (1.3.5)
+ rack-protection (1.1.4)
+ rack
rack-test (0.6.1)
rack (>= 1.0)
- rb-fsevent (0.4.3.1)
- sass (3.1.7)
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
- slim (1.0.2)
- temple (~> 0.3.3)
+ sass (3.1.10)
+ sinatra (1.3.1)
+ rack (>= 1.3.4, ~> 1.3)
+ rack-protection (>= 1.1.2, ~> 1.1)
+ tilt (>= 1.3.3, ~> 1.3)
+ slim (1.0.4)
+ temple (~> 0.3.4)
tilt (~> 1.3.2)
- sprockets (2.0.0)
+ sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
@@ -91,7 +93,7 @@ GEM
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
- uglifier (1.0.3)
+ uglifier (1.0.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
url_mount (0.2.1)
@@ -101,5 +103,5 @@ PLATFORMS
ruby
DEPENDENCIES
- middleman (~> 2.0.8)
+ middleman (~> 2.0.14)
therubyracer-heroku (~> 0.8.0)
View
@@ -81,7 +81,7 @@
# activate :cache_buster
# Use relative URLs
- # activate :relative_assets
+ activate :relative_assets
# Compress PNGs after build
# First: gem install middleman-smusher

0 comments on commit aedbb0d

Please sign in to comment.