summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-09-21 12:41:47 +0200
committerLars Henrik Mai <lars.mai@kontinui.de>2014-09-21 12:41:47 +0200
commitbc34563dc1e47f6e698aee12efde182e986c5b0f (patch)
tree1373ee0f52a09cccf5028e7e4427e0d7dfeef4aa
parent7cc7910df63d19e7ebc67bb1156437f0559712d7 (diff)
update gem dependencies
-rw-r--r--Gemfile.lock121
1 files changed, 65 insertions, 56 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a198bee..e9dca8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,44 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.0.4)
+ activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9)
- minitest (~> 4.2)
- multi_json (~> 1.3)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
thread_safe (~> 0.1)
- tzinfo (~> 0.3.37)
+ tzinfo (~> 1.1)
addressable (2.3.6)
builder (3.2.2)
- chunky_png (1.3.0)
- coffee-script (2.2.0)
+ celluloid (0.16.0)
+ timers (~> 4.0.0)
+ chunky_png (1.3.1)
+ coffee-script (2.3.0)
coffee-script-source
execjs
- coffee-script-source (1.7.0)
- compass (0.12.5)
+ coffee-script-source (1.8.0)
+ compass (1.0.1)
chunky_png (~> 1.2)
- fssm (>= 0.2.7)
- sass (~> 3.2.19)
- compass-import-once (1.0.4)
+ compass-core (~> 1.0.1)
+ compass-import-once (~> 1.0.5)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ sass (>= 3.3.13, < 3.5)
+ compass-core (1.0.1)
+ multi_json (~> 1.0)
+ sass (>= 3.3.0, < 3.5)
+ compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
- em-websocket (0.5.0)
+ em-websocket (0.5.1)
eventmachine (>= 0.12.9)
- http_parser.rb (~> 0.5.3)
+ http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
- execjs (2.0.2)
+ execjs (2.2.1)
ffi (1.9.3)
- fssm (0.2.10)
- haml (4.0.5)
+ haml (4.1.0.beta.1)
tilt
hike (1.2.3)
+ hitimes (1.2.2)
hooks (0.4.0)
uber (~> 0.0.4)
hpricot (0.8.6)
@@ -39,99 +47,100 @@ GEM
haml (>= 4.0.0.rc.1)
hpricot (~> 0.8.6)
ruby_parser (~> 3.1.1)
- http_parser.rb (0.5.3)
- i18n (0.6.9)
+ http_parser.rb (0.6.0)
+ i18n (0.6.11)
json (1.8.1)
- kramdown (1.3.3)
- listen (1.3.1)
+ kramdown (1.4.2)
+ listen (2.7.9)
+ celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
- rb-kqueue (>= 0.2)
- middleman (3.3.2)
- coffee-script (~> 2.2.0)
- compass (>= 0.12.4)
- compass-import-once (~> 1.0.4)
+ middleman (3.3.6)
+ coffee-script (~> 2.2)
+ compass (>= 1.0.0, < 2.0.0)
+ compass-import-once (= 1.0.5)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
- middleman-core (= 3.3.2)
+ middleman-core (= 3.3.6)
middleman-sprockets (>= 3.1.2)
- sass (>= 3.2.17, < 4.0)
+ sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
- middleman-blog (3.5.2)
+ middleman-blog (3.5.3)
addressable (~> 2.3.5)
middleman-core (~> 3.2)
tzinfo (>= 0.3.0)
- middleman-core (3.3.2)
- activesupport (~> 4.0.1)
+ middleman-core (3.3.6)
+ activesupport (~> 4.1.0)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
- listen (~> 1.1)
- padrino-helpers (~> 0.12.1)
+ listen (>= 2.7.9, < 3.0)
+ padrino-helpers (~> 0.12.3)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
- middleman-deploy (0.2.4)
- middleman-core (>= 3.0.0)
+ middleman-deploy (0.3.0)
+ middleman-core (>= 3.2)
net-sftp
ptools
- middleman-livereload (3.3.2)
- em-websocket (~> 0.5.0)
+ middleman-livereload (3.3.4)
+ em-websocket (~> 0.5.1)
middleman-core (~> 3.2)
rack-livereload (~> 0.3.15)
- middleman-sprockets (3.3.2)
- middleman-core (>= 3.2)
- sprockets (~> 2.2)
+ middleman-sprockets (3.3.10)
+ middleman-core (~> 3.3)
+ sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
- sprockets-sass (~> 1.0.0)
+ sprockets-sass (~> 1.2.0)
mini_portile (0.5.3)
- minitest (4.7.5)
- multi_json (1.9.2)
+ minitest (5.4.1)
+ multi_json (1.10.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
- padrino-helpers (0.12.1)
+ padrino-helpers (0.12.3)
i18n (~> 0.6, >= 0.6.7)
- padrino-support (= 0.12.1)
+ padrino-support (= 0.12.3)
tilt (~> 1.4.1)
- padrino-support (0.12.1)
+ padrino-support (0.12.3)
activesupport (>= 3.1)
- ptools (1.2.4)
+ ptools (1.2.6)
rack (1.5.2)
rack-livereload (0.3.15)
rack
rack-test (0.6.2)
rack (>= 1.0)
rb-fsevent (0.9.4)
- rb-inotify (0.9.3)
- ffi (>= 0.5.0)
- rb-kqueue (0.2.2)
+ rb-inotify (0.9.5)
ffi (>= 0.5.0)
ruby_parser (3.1.3)
sexp_processor (~> 4.1)
- sass (3.2.19)
+ sass (3.4.5)
sexp_processor (4.4.4)
- sprockets (2.12.0)
+ sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
- sprockets-sass (1.0.3)
+ sprockets-sass (1.2.0)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.19.1)
- thread_safe (0.3.3)
+ thread_safe (0.3.4)
tilt (1.4.1)
- tzinfo (0.3.39)
- uber (0.0.4)
- uglifier (2.5.0)
+ timers (4.0.1)
+ hitimes
+ tzinfo (1.2.2)
+ thread_safe (~> 0.1)
+ uber (0.0.8)
+ uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)