dan/api_docs
1
0
Fork 0
mirror of https://github.com/danbulant/api_docs synced 2026-05-19 12:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #28 from tripit/dev

Browse source 
Update gems
This commit is contained in:
Tariq Islam 2014-04-10 02:42:19 -07:00
commit 0ddd142279
2 changed files with 49 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -2,7 +2,7 @@
# the following line to use "https"
source 'http://rubygems.org'
gem "middleman", "~>3.2.0"
gem "middleman", "~>3.3.0"
# For syntax highlighting
gem "middleman-syntax"

75
Gemfile.lock
View file

@ -1,29 +1,36 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
activesupport (4.0.4)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
chunky_png (1.3.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
compass (0.12.4)
compass (0.12.5)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.17)
sass (~> 3.2.19)
compass-import-once (1.0.4)
sass (>= 3.2, < 3.5)
em-websocket (0.5.0)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.5.3)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.0.2)
ffi (1.9.3)
fssm (0.2.10)
haml (4.0.5)
tilt
hike (1.2.3)
hooks (0.4.0)
uber (~> 0.0.4)
http_parser.rb (0.5.3)
i18n (0.6.9)
json (1.8.1)
@ -33,40 +40,51 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
middleman (3.2.2)
middleman (3.3.1)
coffee-script (~> 2.2.0)
compass (>= 0.12.2)
execjs (~> 1.4.0)
haml (>= 3.1.6)
compass (>= 0.12.4)
compass-import-once (~> 1.0.4)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.2.2)
middleman-core (= 3.3.1)
middleman-sprockets (>= 3.1.2)
sass (>= 3.1.20)
uglifier (~> 2.4.0)
middleman-core (3.2.2)
activesupport (~> 3.2.6)
sass (>= 3.2.17, < 4.0)
uglifier (~> 2.5)
middleman-core (3.3.1)
activesupport (~> 4.0.1)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
listen (~> 1.1)
rack (>= 1.4.5)
rack-test (~> 0.6.1)
padrino-helpers (~> 0.12.1)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1)
tilt (~> 1.4.1, < 2.0)
middleman-gh-pages (0.0.3)
rake (> 0.9.3)
middleman-livereload (3.3.0)
middleman-livereload (3.3.2)
em-websocket (~> 0.5.0)
middleman-core (~> 3.2)
rack-livereload (~> 0.3.15)
middleman-sprockets (3.3.1)
middleman-sprockets (3.3.2)
middleman-core (>= 3.2)
sprockets (~> 2.1)
sprockets-helpers (~> 1.0.0)
sprockets (~> 2.2)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.0.0)
middleman-syntax (2.0.0)
middleman-core (~> 3.2)
rouge (~> 1.0)
minitest (4.7.5)
multi_json (1.9.2)
padrino-helpers (0.12.1)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.1)
tilt (~> 1.4.1)
padrino-support (0.12.1)
activesupport (>= 3.1)
rack (1.5.2)
rack-livereload (0.3.15)
rack
@ -82,13 +100,13 @@ GEM
ref (1.0.5)
rouge (1.3.3)
ruby18_source_location (0.2)
sass (3.2.18)
sass (3.2.19)
sprockets (2.12.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.0.1)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.0.3)
sprockets (~> 2.0)
@ -97,8 +115,11 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
uglifier (2.4.0)
tzinfo (0.3.39)
uber (0.0.4)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
@ -106,7 +127,7 @@ PLATFORMS
ruby
DEPENDENCIES
middleman (~> 3.2.0)
middleman (~> 3.3.0)
middleman-gh-pages
middleman-livereload (~> 3.3.0)
middleman-syntax