Browse Source

Update to newer versions of gems

master
parent
commit
d23bcbe705
2 changed files with 69 additions and 56 deletions
  1. +68
    -55
      Gemfile.lock
  2. +1
    -1
      Makefile

+ 68
- 55
Gemfile.lock View File

@@ -1,63 +1,72 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (4.1.4)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
chunky_png (1.3.1)
coffee-script (2.2.0)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.7.1)
compass (0.12.7)
coffee-script-source (1.12.2)
compass (1.0.3)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-import-once (1.0.4)
compass-core (~> 1.0.2)
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.3)
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.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.1)
ffi (1.9.3)
fssm (0.2.10)
haml (4.0.5)
eventmachine (1.2.5)
execjs (2.7.0)
ffi (1.9.18)
haml (5.0.4)
temple (>= 0.8.0)
tilt
hike (1.2.3)
hooks (0.4.0)
uber (~> 0.0.4)
hitimes (1.2.6)
hooks (0.4.1)
uber (~> 0.0.14)
http_parser.rb (0.6.0)
i18n (0.6.11)
json (1.8.1)
kramdown (1.4.0)
listen (1.3.1)
i18n (0.7.0)
json (1.8.6)
kramdown (1.16.2)
listen (2.10.1)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
middleman (3.3.3)
coffee-script (~> 2.2.0)
compass (>= 0.12.4)
compass-import-once (= 1.0.4)
middleman (3.3.12)
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.3)
middleman-core (= 3.3.12)
middleman-sprockets (>= 3.1.2)
sass (>= 3.2.17, < 4.0)
sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
middleman-core (3.3.3)
middleman-core (3.3.12)
activesupport (~> 4.1.0)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
listen (~> 1.1)
padrino-helpers (~> 0.12.1)
i18n (~> 0.7.0)
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)
@@ -67,47 +76,48 @@ GEM
middleman-core (>= 3.0.2)
multi_json (~> 1.0)
rack-livereload
middleman-sprockets (3.3.3)
middleman-core (>= 3.2)
sprockets (~> 2.2)
middleman-sprockets (3.5.0)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.1.0)
minitest (5.4.0)
multi_json (1.10.1)
padrino-helpers (0.12.2)
sprockets-sass (~> 1.3.0)
minitest (5.11.1)
multi_json (1.13.1)
padrino-helpers (0.12.8.1)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.2)
padrino-support (= 0.12.8.1)
tilt (~> 1.4.1)
padrino-support (0.12.2)
padrino-support (0.12.8.1)
activesupport (>= 3.1)
rack (1.5.2)
rack-livereload (0.3.15)
rack (1.6.8)
rack-livereload (0.3.16)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rb-kqueue (0.2.3)
ffi (>= 0.5.0)
sass (3.2.19)
sprockets (2.12.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
sass (3.4.25)
sprockets (2.12.4)
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.1.0)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.19.1)
thread_safe (0.3.4)
temple (0.8.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (1.4.1)
tzinfo (1.2.1)
timers (4.0.4)
hitimes
tzinfo (1.2.4)
thread_safe (~> 0.1)
uber (0.0.7)
uglifier (2.5.3)
uber (0.0.15)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)

@@ -119,3 +129,6 @@ DEPENDENCIES
middleman-livereload (~> 3.1.0)
tzinfo-data
wdm (~> 0.1.0)

BUNDLED WITH
1.11.2

+ 1
- 1
Makefile View File

@@ -1,7 +1,7 @@
ALL_TAGS = $(shell ruby -rutils -rset -I. -e 'print picture_info_hashes.reduce(Set.new) {|memo, h| memo + h[:tags]}.to_a.join(" ")')

all: tags thumbnails
middleman build
bundle exec middleman build

tags:
rm -rf source/tag && mkdir source/tag


Loading…
Cancel
Save